Merge git://git.infradead.org/battery-2.6

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

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 3b0fcb255717ead534816b8dd6997f32bc8ad279..8f7ebe41c0246a91d687a1ac91e79509dc062b5f 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -26,6 +26,8 @@
                                    * send and receive non-IEEE 802.1X frames
                                    */
 #define WLAN_STA_SHORT_PREAMBLE BIT(7)
+/* whether this is an AP that we are associated with as a client */
+#define WLAN_STA_ASSOC_AP BIT(8)
 #define WLAN_STA_WME BIT(9)
 #define WLAN_STA_WDS BIT(27)
 
@@ -90,16 +92,11 @@ struct sta_info {
        int channel_use;
        int channel_use_raw;
 
-       int assoc_ap; /* whether this is an AP that we are
-                      * associated with as a client */
-
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
        unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES];
        unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES];
 #endif /* CONFIG_MAC80211_DEBUG_COUNTERS */
 
-       int vlan_id;
-
        u16 listen_interval;
 
 #ifdef CONFIG_MAC80211_DEBUGFS