diff --git a/[refs] b/[refs]
index 45838df746bf..10df09000bbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 051007d9e281cd8ea603a4cc4c96b0170b26c7e9
+refs/heads/master: 10ff57f98d5fccb9bb508ba30230e5df030d67e3
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
index 8a9d5d03bbc2..c0008d5dff0a 100644
--- a/trunk/net/mac80211/mesh.c
+++ b/trunk/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)
 {