浏览代码

mac80211: remove a bit of dead mesh code

In a file that's only built when CONFIG_MAC80211_MESH
is defined, having an #ifdef on the same is entirely
pointless, so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Johannes Berg 12 年之前
父节点
当前提交
10ff57f98d
共有 1 个文件被更改,包括 0 次插入5 次删除
  1. 0 5
      net/mac80211/mesh.c

+ 0 - 5
net/mac80211/mesh.c

@@ -20,16 +20,11 @@
 int mesh_allocated;
 int mesh_allocated;
 static struct kmem_cache *rm_cache;
 static struct kmem_cache *rm_cache;
 
 
-#ifdef CONFIG_MAC80211_MESH
 bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
 bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
 {
 {
 	return (mgmt->u.action.u.mesh_action.action_code ==
 	return (mgmt->u.action.u.mesh_action.action_code ==
 			WLAN_MESH_ACTION_HWMP_PATH_SELECTION);
 			WLAN_MESH_ACTION_HWMP_PATH_SELECTION);
 }
 }
-#else
-bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
-{ return false; }
-#endif
 
 
 void ieee80211s_init(void)
 void ieee80211s_init(void)
 {
 {