mac80211: clean up mesh code

[safe/jmp/linux-2.6] / net / mac80211 / sta_info.h

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 9d1d7a0..4ad5003 100644 (file)
--- 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.