| Message ID | 1360364077-12204-1-git-send-email-thomas@cozybit.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
err subject should be CONFIG_MAC80211_MESH=n. On Fri, Feb 8, 2013 at 2:54 PM, Thomas Pedersen <thomas@cozybit.com> wrote: > The original mesh_sta_cleanup() declaration should have been > inside the ifdef. > > Signed-off-by: Thomas Pedersen <thomas@cozybit.com> > --- > net/mac80211/mesh.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h > index e5f6095..cd7868a 100644 > --- a/net/mac80211/mesh.h > +++ b/net/mac80211/mesh.h > @@ -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 majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2013-02-08 at 14:54 -0800, Thomas Pedersen wrote: > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index e5f6095..cd7868a 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h @@ -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
The original mesh_sta_cleanup() declaration should have been inside the ifdef. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> --- net/mac80211/mesh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)