From: Johannes Berg <johannes.berg@intel.com>
Date: Sat, 15 Dec 2012 08:45:50 +0000 (+0100)
Subject: mac80211: remove a bit of dead mesh code
X-Git-Tag: firefly_0821_release~3680^2~1092^2~242^2^2~157
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=10ff57f98d5fccb9bb508ba30230e5df030d67e3;p=firefly-linux-kernel-4.4.55.git

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>
---

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)
 {