Commit 2a419056 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: simplify station/aggregation code 



A number of places use RCU locking for accessing
the station list, even though they do not need
to. Use mutex locking instead to prepare for the
locking changes I want to make. The mlme code is
also using a WLAN_STA_DISASSOC flag that has the
same meaning as WLAN_STA_BLOCK_BA, so use that.

While doing so, combine places where we loop
over stations twice, and optimise away some of
the loops by checking if the hardware supports
aggregation at all first.

Also fix a more theoretical race condition: right
now we could resume, set up an aggregation session,
and right after tear it down again due to the code
that is needed for hardware reconfiguration here.
Also mark add a comment to that code marking it as
a workaround.

Finally, remove a pointless aggregation disabling
loop when an interface is stopped, directly after
that we remove all stations from it which will also
disable all aggregation sessions that may still be
active, and does so in a race-free way unlike the
current loop that doesn't block new sessions.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9d38d85d

net/mac80211/agg-tx.c

+1 −9
Original line number Diff line number Diff line
@@ -239,17 +239,9 @@ 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_BLOCK_BA)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Suspend in progress. "

		printk(KERN_DEBUG "BA sessions blocked. "

		       "Denying BA session request\n");

#endif

		return -EINVAL;

net/mac80211/iface.c

+0 −13
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ static int ieee80211_stop(struct net_device *dev) 
{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;

	unsigned long flags;

	struct sk_buff *skb, *tmp;

	u32 hw_reconf_flags = 0;
@@ -355,18 +354,6 @@ static int ieee80211_stop(struct net_device *dev) 
	 */

	ieee80211_work_purge(sdata);



	/*

	 * Now delete all active aggregation sessions.

	 */

	rcu_read_lock();



	list_for_each_entry_rcu(sta, &local->sta_list, list) {

		if (sta->sdata == sdata)

			ieee80211_sta_tear_down_BA_sessions(sta);

	}



	rcu_read_unlock();



	/*

	 * Remove all stations associated with this interface.

	 *

net/mac80211/mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -898,13 +898,13 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 
	netif_tx_stop_all_queues(sdata->dev);

	netif_carrier_off(sdata->dev);



	rcu_read_lock();

	mutex_lock(&local->sta_mtx);

	sta = sta_info_get(sdata, bssid);

	if (sta) {

		set_sta_flags(sta, WLAN_STA_DISASSOC);

		set_sta_flags(sta, WLAN_STA_BLOCK_BA);

		ieee80211_sta_tear_down_BA_sessions(sta);

	}

	rcu_read_unlock();

	mutex_unlock(&local->sta_mtx);



	changed |= ieee80211_reset_erp_info(sdata);

net/mac80211/pm.c

+4 −12
Original line number Diff line number Diff line
@@ -40,22 +40,14 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) 
	list_for_each_entry(sdata, &local->interfaces, list)

		ieee80211_disable_keys(sdata);



	/* Tear down aggregation sessions */



	rcu_read_lock();



	/* tear down aggregation sessions and remove STAs */

	mutex_lock(&local->sta_mtx);

	list_for_each_entry(sta, &local->sta_list, list) {

		if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {

		list_for_each_entry_rcu(sta, &local->sta_list, list) {

			set_sta_flags(sta, WLAN_STA_BLOCK_BA);

			ieee80211_sta_tear_down_BA_sessions(sta);

		}

	}



	rcu_read_unlock();



	/* remove STAs */

	mutex_lock(&local->sta_mtx);

	list_for_each_entry(sta, &local->sta_list, list) {

		if (sta->uploaded) {

			sdata = sta->sdata;

			if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

net/mac80211/sta_info.h

+0 −4
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ 
 *	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,
@@ -60,7 +57,6 @@ enum ieee80211_sta_info_flags { 
	WLAN_STA_BLOCK_BA	= 1<<11,

	WLAN_STA_PS_DRIVER	= 1<<12,

	WLAN_STA_PSPOLL		= 1<<13,

	WLAN_STA_DISASSOC       = 1<<14,

};



#define STA_TID_NUM 16

CRA Git | Maintained and supported by SUSTech CRA and CCSE