浏览代码

mac80211: Fix compilation error when mesh is disabled

Wrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation
problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Javier Cardona 14 年之前
父节点
当前提交
7659a193f9
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      net/mac80211/main.c

+ 2 - 0
net/mac80211/main.c

@@ -245,10 +245,12 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
 				sdata->vif.bss_conf.enable_beacon =
 				sdata->vif.bss_conf.enable_beacon =
 					!!sdata->u.ibss.presp;
 					!!sdata->u.ibss.presp;
 				break;
 				break;
+#ifdef CONFIG_MAC80211_MESH
 			case NL80211_IFTYPE_MESH_POINT:
 			case NL80211_IFTYPE_MESH_POINT:
 				sdata->vif.bss_conf.enable_beacon =
 				sdata->vif.bss_conf.enable_beacon =
 					!!sdata->u.mesh.mesh_id_len;
 					!!sdata->u.mesh.mesh_id_len;
 				break;
 				break;
+#endif
 			default:
 			default:
 				/* not reached */
 				/* not reached */
 				WARN_ON(1);
 				WARN_ON(1);