summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-15 09:45:50 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-01-03 13:01:18 +0100
commit10ff57f98d5fccb9bb508ba30230e5df030d67e3 (patch)
tree89cee679c2d3228a9ca28f3b649e28af5c8c1c0d /net/mac80211/mesh.c
parent051007d9e281cd8ea603a4cc4c96b0170b26c7e9 (diff)
downloadblackbird-op-linux-10ff57f98d5fccb9bb508ba30230e5df030d67e3.tar.gz
blackbird-op-linux-10ff57f98d5fccb9bb508ba30230e5df030d67e3.zip
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>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 8a9d5d03bbc2..c0008d5dff0a 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -20,16 +20,11 @@
int mesh_allocated;
static struct kmem_cache *rm_cache;
-#ifdef CONFIG_MAC80211_MESH
bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
{
return (mgmt->u.action.u.mesh_action.action_code ==
WLAN_MESH_ACTION_HWMP_PATH_SELECTION);
}
-#else
-bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
-{ return false; }
-#endif
void ieee80211s_init(void)
{
OpenPOWER on IntegriCloud