Commit 53f73c09 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: avoid transmitting delBA to old AP 



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: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 845d708e

net/mac80211/agg-rx.c

+4 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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);
@@ -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);

}

net/mac80211/agg-tx.c

+9 −5
Original line number Diff line number Diff line
@@ -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];
@@ -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,
@@ -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);
@@ -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);
@@ -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:

net/mac80211/debugfs_sta.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}

net/mac80211/ht.c

+10 −7
Original line number Diff line number Diff line
@@ -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);

	}

}
@@ -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)
@@ -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);

}
@@ -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,

net/mac80211/ieee80211_i.h

+7 −5
Original line number Diff line number Diff line
@@ -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);
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE