diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2010-04-06 05:18:46 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-07 14:38:04 -0400 |
commit | 618f356b95e37ca0c30b3b513898fda54abd52a6 (patch) | |
tree | 950d67d39fa3e6b70a5cbf593b85f53416fa051e /net/mac80211 | |
parent | 66b0470aeef10a3b0f9a6a1c60d908b5a06c62ae (diff) |
mac80211: rename WLAN_STA_SUSPEND to WLAN_STA_BLOCK_BA
I want to use it during station destruction as well
so rename it to WLAN_STA_BLOCK_BA which is also the
only use of it now.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/agg-rx.c | 2 | ||||
-rw-r--r-- | net/mac80211/agg-tx.c | 2 | ||||
-rw-r--r-- | net/mac80211/pm.c | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.h | 6 | ||||
-rw-r--r-- | net/mac80211/util.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index cb9f80a94002..7d87f446f030 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c | |||
@@ -173,7 +173,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, | |||
173 | 173 | ||
174 | status = WLAN_STATUS_REQUEST_DECLINED; | 174 | status = WLAN_STATUS_REQUEST_DECLINED; |
175 | 175 | ||
176 | if (test_sta_flags(sta, WLAN_STA_SUSPEND)) { | 176 | if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) { |
177 | #ifdef CONFIG_MAC80211_HT_DEBUG | 177 | #ifdef CONFIG_MAC80211_HT_DEBUG |
178 | printk(KERN_DEBUG "Suspend in progress. " | 178 | printk(KERN_DEBUG "Suspend in progress. " |
179 | "Denying ADDBA request\n"); | 179 | "Denying ADDBA request\n"); |
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index bb4ac70fc97a..32d2148b5b98 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c | |||
@@ -245,7 +245,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) | |||
245 | return -EINVAL; | 245 | return -EINVAL; |
246 | } | 246 | } |
247 | 247 | ||
248 | if (test_sta_flags(sta, WLAN_STA_SUSPEND)) { | 248 | if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) { |
249 | #ifdef CONFIG_MAC80211_HT_DEBUG | 249 | #ifdef CONFIG_MAC80211_HT_DEBUG |
250 | printk(KERN_DEBUG "Suspend in progress. " | 250 | printk(KERN_DEBUG "Suspend in progress. " |
251 | "Denying BA session request\n"); | 251 | "Denying BA session request\n"); |
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 0e64484e861c..75202b295a4e 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c | |||
@@ -46,7 +46,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) | |||
46 | 46 | ||
47 | if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { | 47 | if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { |
48 | list_for_each_entry_rcu(sta, &local->sta_list, list) { | 48 | list_for_each_entry_rcu(sta, &local->sta_list, list) { |
49 | set_sta_flags(sta, WLAN_STA_SUSPEND); | 49 | set_sta_flags(sta, WLAN_STA_BLOCK_BA); |
50 | ieee80211_sta_tear_down_BA_sessions(sta); | 50 | ieee80211_sta_tear_down_BA_sessions(sta); |
51 | } | 51 | } |
52 | } | 52 | } |
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 2b635909de5c..57e81758d6f7 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -35,8 +35,8 @@ | |||
35 | * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next | 35 | * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next |
36 | * frame to this station is transmitted. | 36 | * frame to this station is transmitted. |
37 | * @WLAN_STA_MFP: Management frame protection is used with this STA. | 37 | * @WLAN_STA_MFP: Management frame protection is used with this STA. |
38 | * @WLAN_STA_SUSPEND: Set/cleared during a suspend/resume cycle. | 38 | * @WLAN_STA_BLOCK_BA: Used to deny ADDBA requests (both TX and RX) |
39 | * Used to deny ADDBA requests (both TX and RX). | 39 | * during suspend/resume. |
40 | * @WLAN_STA_PS_DRIVER: driver requires keeping this station in | 40 | * @WLAN_STA_PS_DRIVER: driver requires keeping this station in |
41 | * power-save mode logically to flush frames that might still | 41 | * power-save mode logically to flush frames that might still |
42 | * be in the queues | 42 | * be in the queues |
@@ -57,7 +57,7 @@ enum ieee80211_sta_info_flags { | |||
57 | WLAN_STA_WDS = 1<<7, | 57 | WLAN_STA_WDS = 1<<7, |
58 | WLAN_STA_CLEAR_PS_FILT = 1<<9, | 58 | WLAN_STA_CLEAR_PS_FILT = 1<<9, |
59 | WLAN_STA_MFP = 1<<10, | 59 | WLAN_STA_MFP = 1<<10, |
60 | WLAN_STA_SUSPEND = 1<<11, | 60 | WLAN_STA_BLOCK_BA = 1<<11, |
61 | WLAN_STA_PS_DRIVER = 1<<12, | 61 | WLAN_STA_PS_DRIVER = 1<<12, |
62 | WLAN_STA_PSPOLL = 1<<13, | 62 | WLAN_STA_PSPOLL = 1<<13, |
63 | WLAN_STA_DISASSOC = 1<<14, | 63 | WLAN_STA_DISASSOC = 1<<14, |
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 7b2c170af71c..7614821caed5 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -1140,7 +1140,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) | |||
1140 | 1140 | ||
1141 | if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { | 1141 | if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { |
1142 | list_for_each_entry_rcu(sta, &local->sta_list, list) { | 1142 | list_for_each_entry_rcu(sta, &local->sta_list, list) { |
1143 | clear_sta_flags(sta, WLAN_STA_SUSPEND); | 1143 | clear_sta_flags(sta, WLAN_STA_BLOCK_BA); |
1144 | } | 1144 | } |
1145 | } | 1145 | } |
1146 | 1146 | ||