diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 17:01:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:58 -0400 |
commit | c9ee23dfac61a713de48b20999dcacb7ef3c5ed0 (patch) | |
tree | 26b0f858fd48be3ff1b0ed4e4f968d6fb4e0a68b /net/mac80211/sta_info.h | |
parent | 52aa944a182545a987dc753f9602235a3359df0c (diff) |
[MAC80211]: make assoc_ap a flag
The sta_info.assoc_ap value is used as a flag, move it
into flags.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r-- | net/mac80211/sta_info.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 3b0fcb255717..e3ae0f5cc228 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -26,6 +26,8 @@ | |||
26 | * send and receive non-IEEE 802.1X frames | 26 | * send and receive non-IEEE 802.1X frames |
27 | */ | 27 | */ |
28 | #define WLAN_STA_SHORT_PREAMBLE BIT(7) | 28 | #define WLAN_STA_SHORT_PREAMBLE BIT(7) |
29 | /* whether this is an AP that we are associated with as a client */ | ||
30 | #define WLAN_STA_ASSOC_AP BIT(8) | ||
29 | #define WLAN_STA_WME BIT(9) | 31 | #define WLAN_STA_WME BIT(9) |
30 | #define WLAN_STA_WDS BIT(27) | 32 | #define WLAN_STA_WDS BIT(27) |
31 | 33 | ||
@@ -90,9 +92,6 @@ struct sta_info { | |||
90 | int channel_use; | 92 | int channel_use; |
91 | int channel_use_raw; | 93 | int channel_use_raw; |
92 | 94 | ||
93 | int assoc_ap; /* whether this is an AP that we are | ||
94 | * associated with as a client */ | ||
95 | |||
96 | #ifdef CONFIG_MAC80211_DEBUG_COUNTERS | 95 | #ifdef CONFIG_MAC80211_DEBUG_COUNTERS |
97 | unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES]; | 96 | unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES]; |
98 | unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES]; | 97 | unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES]; |