mac80211: clean up mesh code

Various cleanups, reducing the #ifdef mess and other things.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 2 deletions

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 9d1d7a0e3114..4ad500373d5a 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -107,7 +107,6 @@ struct tid_ampdu_rx {
         struct timer_list session_timer;
 };
 
-#ifdef CONFIG_MAC80211_MESH
 enum plink_state {
         LISTEN,
         OPN_SNT,
@@ -117,7 +116,6 @@ enum plink_state {
         HOLDING,
         BLOCKED
 };
-#endif
 
 /**
  * struct sta_ampdu_mlme - STA aggregation information.