Skip to contentSkip to conversation

mac80211: fix CONFIG_MAC80211=n build breakage

PATCH In review Thomas Pedersen 3 participants 3 messages Feb 8, 2013 mac80211

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mac80211: fix CONFIG_MAC80211=n build breakage

The original mesh_sta_cleanup() declaration should have been inside the ifdef.

---
 net/mac80211/mesh.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mesh.h +1 -1
index e5f6095..cd7868a 100644
@@ -294,7 +294,6 @@ void mesh_plink_block(struct sta_info *sta);
 void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
 			 struct ieee80211_mgmt *mgmt, size_t len,
 			 struct ieee80211_rx_status *rx_status);
-void mesh_sta_cleanup(struct sta_info *sta);
 
 /* Private interfaces */
 /* Mesh tables */
@@ -367,6 +366,7 @@ void mesh_plink_quiesce(struct sta_info *sta);
 void mesh_plink_restart(struct sta_info *sta);
 void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
 void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);
+void mesh_sta_cleanup(struct sta_info *sta);
 #else
 #define mesh_allocated	0
 static inline void
Signature · 1 line
1.7.10.4
#1 lore raw

err subject should be CONFIG_MAC80211_MESH=n.

Quoted 35 lines · Thomas Pedersen

The original mesh_sta_cleanup() declaration should have been inside the ifdef.

---
 net/mac80211/mesh.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mesh.h +1 -2
index e5f6095..cd7868a 100644
@@ -294,7 +294,6 @@ void mesh_plink_block(struct sta_info *sta);
 void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
                         struct ieee80211_mgmt *mgmt, size_t len,
                         struct ieee80211_rx_status *rx_status);
-void mesh_sta_cleanup(struct sta_info *sta);
 
 /* Private interfaces */
 /* Mesh tables */
@@ -367,6 +366,7 @@ void mesh_plink_quiesce(struct sta_info *sta);
 void mesh_plink_restart(struct sta_info *sta);
 void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
 void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);
+void mesh_sta_cleanup(struct sta_info *sta);
 #else
 #define mesh_allocated 0
 static inline void
--

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#2 lore raw
In reply to Thomas Pedersen
Quoted 2 lines · Thomas Pedersen

The original mesh_sta_cleanup() declaration should have been inside the ifdef.

Nah, the one in the #else can just be removed since it's only ever called from where the compiler can prove it won't be needed so no linkage is generated. I already fixed it anyway, and amended the original patch rebasing my tree.

:-)

johannes