Commit 618f356b authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 66b0470a
...@@ -173,7 +173,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, ...@@ -173,7 +173,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
status = WLAN_STATUS_REQUEST_DECLINED; status = WLAN_STATUS_REQUEST_DECLINED;
if (test_sta_flags(sta, WLAN_STA_SUSPEND)) { if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Suspend in progress. " printk(KERN_DEBUG "Suspend in progress. "
"Denying ADDBA request\n"); "Denying ADDBA request\n");
......
...@@ -245,7 +245,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) ...@@ -245,7 +245,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid)
return -EINVAL; return -EINVAL;
} }
if (test_sta_flags(sta, WLAN_STA_SUSPEND)) { if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Suspend in progress. " printk(KERN_DEBUG "Suspend in progress. "
"Denying BA session request\n"); "Denying BA session request\n");
......
...@@ -46,7 +46,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) ...@@ -46,7 +46,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
list_for_each_entry_rcu(sta, &local->sta_list, list) { list_for_each_entry_rcu(sta, &local->sta_list, list) {
set_sta_flags(sta, WLAN_STA_SUSPEND); set_sta_flags(sta, WLAN_STA_BLOCK_BA);
ieee80211_sta_tear_down_BA_sessions(sta); ieee80211_sta_tear_down_BA_sessions(sta);
} }
} }
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
* IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
* frame to this station is transmitted. * frame to this station is transmitted.
* @WLAN_STA_MFP: Management frame protection is used with this STA. * @WLAN_STA_MFP: Management frame protection is used with this STA.
* @WLAN_STA_SUSPEND: Set/cleared during a suspend/resume cycle. * @WLAN_STA_BLOCK_BA: Used to deny ADDBA requests (both TX and RX)
* Used to deny ADDBA requests (both TX and RX). * during suspend/resume.
* @WLAN_STA_PS_DRIVER: driver requires keeping this station in * @WLAN_STA_PS_DRIVER: driver requires keeping this station in
* power-save mode logically to flush frames that might still * power-save mode logically to flush frames that might still
* be in the queues * be in the queues
...@@ -57,7 +57,7 @@ enum ieee80211_sta_info_flags { ...@@ -57,7 +57,7 @@ enum ieee80211_sta_info_flags {
WLAN_STA_WDS = 1<<7, WLAN_STA_WDS = 1<<7,
WLAN_STA_CLEAR_PS_FILT = 1<<9, WLAN_STA_CLEAR_PS_FILT = 1<<9,
WLAN_STA_MFP = 1<<10, WLAN_STA_MFP = 1<<10,
WLAN_STA_SUSPEND = 1<<11, WLAN_STA_BLOCK_BA = 1<<11,
WLAN_STA_PS_DRIVER = 1<<12, WLAN_STA_PS_DRIVER = 1<<12,
WLAN_STA_PSPOLL = 1<<13, WLAN_STA_PSPOLL = 1<<13,
WLAN_STA_DISASSOC = 1<<14, WLAN_STA_DISASSOC = 1<<14,
......
...@@ -1140,7 +1140,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) ...@@ -1140,7 +1140,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
list_for_each_entry_rcu(sta, &local->sta_list, list) { list_for_each_entry_rcu(sta, &local->sta_list, list) {
clear_sta_flags(sta, WLAN_STA_SUSPEND); clear_sta_flags(sta, WLAN_STA_BLOCK_BA);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment