Skip to content

Commit

Permalink
mac80211: avoid transmitting delBA to old AP
Browse files Browse the repository at this point in the history 
When roaming while we have active BA session,
we can end up transmitting delBA frames to
the old AP while we're already on the new AP's
channel, which can cause warnings.

Simply avoid sending those frames, but still
tear down the internal session state, since
they are not really necessary anyway as we
will implicitly disassociate when sending the
association to the new AP.

Signed-off-by: Johannes Berg <[email protected]>
Acked-by: Luis R. Rodriguez <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
  • Loading branch information
@jmberg-intel @linvjw
jmberg-intel authored and linvjw committed Oct 6, 2010
1 parent 845d708 commit 53f73c0
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 35 deletions.
8 changes: 4 additions & 4 deletions net/mac80211/agg-rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static void ieee80211_free_tid_rx(struct rcu_head *h)
}

void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
u16 initiator, u16 reason)
u16 initiator, u16 reason, bool tx)
{
struct ieee80211_local *local = sta->local;
struct tid_ampdu_rx *tid_rx;
Expand All @@ -81,7 +81,7 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
"aggregation for tid %d\n", tid);

/* check if this is a self generated aggregation halt */
if (initiator == WLAN_BACK_RECIPIENT)
if (initiator == WLAN_BACK_RECIPIENT && tx)
ieee80211_send_delba(sta->sdata, sta->sta.addr,
tid, 0, reason);

Expand All @@ -92,10 +92,10 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
}

void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
u16 initiator, u16 reason)
u16 initiator, u16 reason, bool tx)
{
mutex_lock(&sta->ampdu_mlme.mtx);
___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason);
___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason, tx);
mutex_unlock(&sta->ampdu_mlme.mtx);
}

Expand Down
14 changes: 9 additions & 5 deletions net/mac80211/agg-tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ static void kfree_tid_tx(struct rcu_head *rcu_head)
}

int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
enum ieee80211_back_parties initiator)
enum ieee80211_back_parties initiator,
bool tx)
{
struct ieee80211_local *local = sta->local;
struct tid_ampdu_tx *tid_tx = sta->ampdu_mlme.tid_tx[tid];
Expand Down Expand Up @@ -185,6 +186,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
clear_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state);

tid_tx->stop_initiator = initiator;
tid_tx->tx_stop = tx;

ret = drv_ampdu_action(local, sta->sdata,
IEEE80211_AMPDU_TX_STOP,
Expand Down Expand Up @@ -577,13 +579,14 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
EXPORT_SYMBOL(ieee80211_start_tx_ba_cb_irqsafe);

int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
enum ieee80211_back_parties initiator)
enum ieee80211_back_parties initiator,
bool tx)
{
int ret;

mutex_lock(&sta->ampdu_mlme.mtx);

ret = ___ieee80211_stop_tx_ba_session(sta, tid, initiator);
ret = ___ieee80211_stop_tx_ba_session(sta, tid, initiator, tx);

mutex_unlock(&sta->ampdu_mlme.mtx);

Expand Down Expand Up @@ -672,7 +675,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
goto unlock_sta;
}

if (tid_tx->stop_initiator == WLAN_BACK_INITIATOR)
if (tid_tx->stop_initiator == WLAN_BACK_INITIATOR && tid_tx->tx_stop)
ieee80211_send_delba(sta->sdata, ra, tid,
WLAN_BACK_INITIATOR, WLAN_REASON_QSTA_NOT_USE);

Expand Down Expand Up @@ -772,7 +775,8 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,

sta->ampdu_mlme.addba_req_num[tid] = 0;
} else {
___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR);
___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR,
true);
}

out:
Expand Down
3 changes: 2 additions & 1 deletion net/mac80211/debugfs_sta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu
else
ret = ieee80211_stop_tx_ba_session(&sta->sta, tid);
} else {
__ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT, 3);
__ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
3, true);
ret = 0;
}

Expand Down
17 changes: 10 additions & 7 deletions net/mac80211/ht.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,16 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband,
ht_cap->mcs.rx_mask[32/8] |= 1;
}

void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta)
void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta, bool tx)
{
int i;

cancel_work_sync(&sta->ampdu_mlme.work);

for (i = 0; i < STA_TID_NUM; i++) {
__ieee80211_stop_tx_ba_session(sta, i, WLAN_BACK_INITIATOR);
__ieee80211_stop_tx_ba_session(sta, i, WLAN_BACK_INITIATOR, tx);
__ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT,
WLAN_REASON_QSTA_LEAVE_QBSS);
WLAN_REASON_QSTA_LEAVE_QBSS, tx);
}
}

Expand All @@ -135,7 +135,7 @@ void ieee80211_ba_session_work(struct work_struct *work)
if (test_and_clear_bit(tid, sta->ampdu_mlme.tid_rx_timer_expired))
___ieee80211_stop_rx_ba_session(
sta, tid, WLAN_BACK_RECIPIENT,
WLAN_REASON_QSTA_TIMEOUT);
WLAN_REASON_QSTA_TIMEOUT, true);

tid_tx = sta->ampdu_mlme.tid_tx[tid];
if (!tid_tx)
Expand All @@ -146,7 +146,8 @@ void ieee80211_ba_session_work(struct work_struct *work)
else if (test_and_clear_bit(HT_AGG_STATE_WANT_STOP,
&tid_tx->state))
___ieee80211_stop_tx_ba_session(sta, tid,
WLAN_BACK_INITIATOR);
WLAN_BACK_INITIATOR,
true);
}
mutex_unlock(&sta->ampdu_mlme.mtx);
}
Expand Down Expand Up @@ -214,9 +215,11 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
#endif /* CONFIG_MAC80211_HT_DEBUG */

if (initiator == WLAN_BACK_INITIATOR)
__ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_INITIATOR, 0);
__ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_INITIATOR, 0,
true);
else
__ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_RECIPIENT);
__ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
true);
}

int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
Expand Down
12 changes: 7 additions & 5 deletions net/mac80211/ieee80211_i.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1175,10 +1175,10 @@ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
void ieee80211_request_smps_work(struct work_struct *work);

void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
u16 initiator, u16 reason);
u16 initiator, u16 reason, bool stop);
void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
u16 initiator, u16 reason);
void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta);
u16 initiator, u16 reason, bool stop);
void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta, bool tx);
void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta,
struct ieee80211_mgmt *mgmt, size_t len);
Expand All @@ -1192,9 +1192,11 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
size_t len);

int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
enum ieee80211_back_parties initiator);
enum ieee80211_back_parties initiator,
bool tx);
int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
enum ieee80211_back_parties initiator);
enum ieee80211_back_parties initiator,
bool tx);
void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
void ieee80211_ba_session_work(struct work_struct *work);
Expand Down
3 changes: 2 additions & 1 deletion net/mac80211/iface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,8 @@ static void ieee80211_iface_work(struct work_struct *work)

__ieee80211_stop_rx_ba_session(
sta, tid, WLAN_BACK_RECIPIENT,
WLAN_REASON_QSTA_REQUIRE_SETUP);
WLAN_REASON_QSTA_REQUIRE_SETUP,
true);
}
mutex_unlock(&local->sta_mtx);
} else switch (sdata->vif.type) {
Expand Down
18 changes: 9 additions & 9 deletions net/mac80211/mlme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
}

static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
bool remove_sta)
bool remove_sta, bool tx)
{
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
struct ieee80211_local *local = sdata->local;
Expand Down Expand Up @@ -960,7 +960,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
sta = sta_info_get(sdata, bssid);
if (sta) {
set_sta_flags(sta, WLAN_STA_BLOCK_BA);
ieee80211_sta_tear_down_BA_sessions(sta);
ieee80211_sta_tear_down_BA_sessions(sta, tx);
}
mutex_unlock(&local->sta_mtx);

Expand Down Expand Up @@ -1124,7 +1124,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata)

printk(KERN_DEBUG "Connection to AP %pM lost.\n", bssid);

ieee80211_set_disassoc(sdata, true);
ieee80211_set_disassoc(sdata, true, true);
mutex_unlock(&ifmgd->mtx);

mutex_lock(&local->mtx);
Expand Down Expand Up @@ -1197,7 +1197,7 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
printk(KERN_DEBUG "%s: deauthenticated from %pM (Reason: %u)\n",
sdata->name, bssid, reason_code);

ieee80211_set_disassoc(sdata, true);
ieee80211_set_disassoc(sdata, true, false);
mutex_lock(&sdata->local->mtx);
ieee80211_recalc_idle(sdata->local);
mutex_unlock(&sdata->local->mtx);
Expand Down Expand Up @@ -1229,7 +1229,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
printk(KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n",
sdata->name, mgmt->sa, reason_code);

ieee80211_set_disassoc(sdata, true);
ieee80211_set_disassoc(sdata, true, false);
mutex_lock(&sdata->local->mtx);
ieee80211_recalc_idle(sdata->local);
mutex_unlock(&sdata->local->mtx);
Expand Down Expand Up @@ -1880,7 +1880,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
printk(KERN_DEBUG "No probe response from AP %pM"
" after %dms, disconnecting.\n",
bssid, (1000 * IEEE80211_PROBE_WAIT)/HZ);
ieee80211_set_disassoc(sdata, true);
ieee80211_set_disassoc(sdata, true, true);
mutex_unlock(&ifmgd->mtx);
mutex_lock(&local->mtx);
ieee80211_recalc_idle(local);
Expand Down Expand Up @@ -2204,7 +2204,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
}

/* Trying to reassociate - clear previous association state */
ieee80211_set_disassoc(sdata, true);
ieee80211_set_disassoc(sdata, true, false);
}
mutex_unlock(&ifmgd->mtx);

Expand Down Expand Up @@ -2318,7 +2318,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,

memcpy(bssid, req->bss->bssid, ETH_ALEN);
if (ifmgd->associated == req->bss) {
ieee80211_set_disassoc(sdata, false);
ieee80211_set_disassoc(sdata, false, true);
mutex_unlock(&ifmgd->mtx);
assoc_bss = true;
} else {
Expand Down Expand Up @@ -2401,7 +2401,7 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
sdata->name, req->bss->bssid, req->reason_code);

memcpy(bssid, req->bss->bssid, ETH_ALEN);
ieee80211_set_disassoc(sdata, false);
ieee80211_set_disassoc(sdata, false, true);

mutex_unlock(&ifmgd->mtx);

Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
list_for_each_entry(sta, &local->sta_list, list) {
if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
set_sta_flags(sta, WLAN_STA_BLOCK_BA);
ieee80211_sta_tear_down_BA_sessions(sta);
ieee80211_sta_tear_down_BA_sessions(sta, true);
}

if (sta->uploaded) {
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/sta_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
* will be sufficient.
*/
set_sta_flags(sta, WLAN_STA_BLOCK_BA);
ieee80211_sta_tear_down_BA_sessions(sta);
ieee80211_sta_tear_down_BA_sessions(sta, true);

spin_lock_irqsave(&local->sta_lock, flags);
ret = sta_info_hash_del(local, sta);
Expand Down
2 changes: 2 additions & 0 deletions net/mac80211/sta_info.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ enum ieee80211_sta_info_flags {
* @dialog_token: dialog token for aggregation session
* @state: session state (see above)
* @stop_initiator: initiator of a session stop
* @tx_stop: TX DelBA frame when stopping
*
* This structure is protected by RCU and the per-station
* spinlock. Assignments to the array holding it must hold
Expand All @@ -95,6 +96,7 @@ struct tid_ampdu_tx {
unsigned long state;
u8 dialog_token;
u8 stop_initiator;
bool tx_stop;
};

/**
Expand Down
2 changes: 1 addition & 1 deletion net/mac80211/util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
mutex_lock(&local->sta_mtx);

list_for_each_entry(sta, &local->sta_list, list) {
ieee80211_sta_tear_down_BA_sessions(sta);
ieee80211_sta_tear_down_BA_sessions(sta, true);
clear_sta_flags(sta, WLAN_STA_BLOCK_BA);
}

Expand Down

0 comments on commit 53f73c0

Please sign in to comment.