Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cad6c7c authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

mac80211: Deny TX BA session requests during disassociation 



In associated state, when bringing an interface down, existing
BA sessions are torn down. When this is in progress, nothing
prevents mac80211 from accepting another BA session start request.

Use a new station flag to fix this.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f3233831

net/mac80211/agg-tx.c

+8 −0
Original line number Diff line number Diff line
@@ -237,6 +237,14 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) 
	    sdata->vif.type != NL80211_IFTYPE_AP)

		return -EINVAL;



	if (test_sta_flags(sta, WLAN_STA_DISASSOC)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Disassociation is in progress. "

		       "Denying BA session request\n");

#endif

		return -EINVAL;

	}



	if (test_sta_flags(sta, WLAN_STA_SUSPEND)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Suspend in progress. "

net/mac80211/mlme.c

+3 −1
Original line number Diff line number Diff line
@@ -797,8 +797,10 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata) 


	rcu_read_lock();

	sta = sta_info_get(sdata, bssid);

	if (sta)

	if (sta) {

		set_sta_flags(sta, WLAN_STA_DISASSOC);

		ieee80211_sta_tear_down_BA_sessions(sta);

	}

	rcu_read_unlock();



	changed |= ieee80211_reset_erp_info(sdata);

net/mac80211/sta_info.h

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
 *	be in the queues

 * @WLAN_STA_PSPOLL: Station sent PS-poll while driver was keeping

 *	station in power-save mode, reply when the driver unblocks.

 * @WLAN_STA_DISASSOC: Disassociation in progress.

 *	This is used to reject TX BA session requests when disassociation

 *	is in progress.

 */

enum ieee80211_sta_info_flags {

	WLAN_STA_AUTH		= 1<<0,
@@ -57,6 +60,7 @@ enum ieee80211_sta_info_flags { 
	WLAN_STA_SUSPEND	= 1<<11,

	WLAN_STA_PS_DRIVER	= 1<<12,

	WLAN_STA_PSPOLL		= 1<<13,

	WLAN_STA_DISASSOC       = 1<<14,

};



#define STA_TID_NUM 16