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

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

mac80211: optimise station flags 



The flaglock in struct sta_info has long been
something that I wanted to get rid of, this
finally does the conversion to atomic bitops.

The conversion itself is straight-forward in
most places, a few things needed to change a
bit since we can no longer use multiple bits
at the same time.

On x86-64, this is a fairly significant code
size reduction:
   text	   data	    bss	    dec	    hex
 427861	  23648	   1008	 452517	  6e7a5	before
 425383	  23648	    976	 450007	  6ddd7	after

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

net/mac80211/agg-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, 


	status = WLAN_STATUS_REQUEST_DECLINED;



	if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {

	if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Suspend in progress. "

		       "Denying ADDBA request\n");

net/mac80211/agg-tx.c

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

	if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "BA sessions blocked. "

		       "Denying BA session request\n");

net/mac80211/cfg.c

+24 −20
Original line number Diff line number Diff line
@@ -668,7 +668,6 @@ static void sta_apply_parameters(struct ieee80211_local *local, 
				 struct sta_info *sta,

				 struct station_parameters *params)

{

	unsigned long flags;

	u32 rates;

	int i, j;

	struct ieee80211_supported_band *sband;
@@ -677,49 +676,53 @@ static void sta_apply_parameters(struct ieee80211_local *local, 


	sband = local->hw.wiphy->bands[local->oper_channel->band];



	spin_lock_irqsave(&sta->flaglock, flags);

	mask = params->sta_flags_mask;

	set = params->sta_flags_set;



	if (mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {

		sta->flags &= ~WLAN_STA_AUTHORIZED;

		if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))

			sta->flags |= WLAN_STA_AUTHORIZED;

			set_sta_flag(sta, WLAN_STA_AUTHORIZED);

		else

			clear_sta_flag(sta, WLAN_STA_AUTHORIZED);

	}



	if (mask & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE)) {

		sta->flags &= ~WLAN_STA_SHORT_PREAMBLE;

		if (set & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE))

			sta->flags |= WLAN_STA_SHORT_PREAMBLE;

			set_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE);

		else

			clear_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE);

	}



	if (mask & BIT(NL80211_STA_FLAG_WME)) {

		sta->flags &= ~WLAN_STA_WME;

		sta->sta.wme = false;

		if (set & BIT(NL80211_STA_FLAG_WME)) {

			sta->flags |= WLAN_STA_WME;

			set_sta_flag(sta, WLAN_STA_WME);

			sta->sta.wme = true;

		} else {

			clear_sta_flag(sta, WLAN_STA_WME);

			sta->sta.wme = false;

		}

	}



	if (mask & BIT(NL80211_STA_FLAG_MFP)) {

		sta->flags &= ~WLAN_STA_MFP;

		if (set & BIT(NL80211_STA_FLAG_MFP))

			sta->flags |= WLAN_STA_MFP;

			set_sta_flag(sta, WLAN_STA_MFP);

		else

			clear_sta_flag(sta, WLAN_STA_MFP);

	}



	if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED)) {

		sta->flags &= ~WLAN_STA_AUTH;

		if (set & BIT(NL80211_STA_FLAG_AUTHENTICATED))

			sta->flags |= WLAN_STA_AUTH;

			set_sta_flag(sta, WLAN_STA_AUTH);

		else

			clear_sta_flag(sta, WLAN_STA_AUTH);

	}



	if (mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) {

		sta->flags &= ~WLAN_STA_TDLS_PEER;

		if (set & BIT(NL80211_STA_FLAG_TDLS_PEER))

			sta->flags |= WLAN_STA_TDLS_PEER;

			set_sta_flag(sta, WLAN_STA_TDLS_PEER);

		else

			clear_sta_flag(sta, WLAN_STA_TDLS_PEER);

	}

	spin_unlock_irqrestore(&sta->flaglock, flags);



	if (params->sta_modify_mask & STATION_PARAM_APPLY_UAPSD) {

		sta->sta.uapsd_queues = params->uapsd_queues;
@@ -815,12 +818,13 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 
	if (!sta)

		return -ENOMEM;



	sta->flags = WLAN_STA_AUTH | WLAN_STA_ASSOC;

	set_sta_flag(sta, WLAN_STA_AUTH);

	set_sta_flag(sta, WLAN_STA_ASSOC);



	sta_apply_parameters(local, sta, params);



	/* Only TDLS-supporting stations can add TDLS peers */

	if ((sta->flags & WLAN_STA_TDLS_PEER) &&

	if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) &&

	    !((wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS) &&

	      sdata->vif.type == NL80211_IFTYPE_STATION))

		return -ENOTSUPP;
@@ -880,7 +884,7 @@ static int ieee80211_change_station(struct wiphy *wiphy, 
	/* The TDLS bit cannot be toggled after the STA was added */

	if ((params->sta_flags_mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) &&

	    !!(params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) !=

	    !!test_sta_flags(sta, WLAN_STA_TDLS_PEER)) {

	    !!test_sta_flag(sta, WLAN_STA_TDLS_PEER)) {

		rcu_read_unlock();

		return -EINVAL;

	}
@@ -2449,7 +2453,7 @@ static int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, 
			return -ENOLINK;

		}



		set_sta_flags(sta, WLAN_STA_TDLS_PEER_AUTH);

		set_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH);

		rcu_read_unlock();

		break;

	case NL80211_TDLS_DISABLE_LINK:

net/mac80211/debugfs_sta.c

+10 −10
Original line number Diff line number Diff line
@@ -58,17 +58,17 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf, 
{

	char buf[100];

	struct sta_info *sta = file->private_data;

	u32 staflags = get_sta_flags(sta);



	int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",

		staflags & WLAN_STA_AUTH ? "AUTH\n" : "",

		staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",

		staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",

		staflags & WLAN_STA_PS_DRIVER ? "PS (driver)\n" : "",

		staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",

		staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",

		staflags & WLAN_STA_WME ? "WME\n" : "",

		staflags & WLAN_STA_WDS ? "WDS\n" : "",

		staflags & WLAN_STA_MFP ? "MFP\n" : "");

		test_sta_flag(sta, WLAN_STA_AUTH) ? "AUTH\n" : "",

		test_sta_flag(sta, WLAN_STA_ASSOC) ? "ASSOC\n" : "",

		test_sta_flag(sta, WLAN_STA_PS_STA) ? "PS (sta)\n" : "",

		test_sta_flag(sta, WLAN_STA_PS_DRIVER) ? "PS (driver)\n" : "",

		test_sta_flag(sta, WLAN_STA_AUTHORIZED) ? "AUTHORIZED\n" : "",

		test_sta_flag(sta, WLAN_STA_SHORT_PREAMBLE) ? "SHORT PREAMBLE\n" : "",

		test_sta_flag(sta, WLAN_STA_WME) ? "WME\n" : "",

		test_sta_flag(sta, WLAN_STA_WDS) ? "WDS\n" : "",

		test_sta_flag(sta, WLAN_STA_MFP) ? "MFP\n" : "");

	return simple_read_from_buffer(userbuf, count, ppos, buf, res);

}

STA_OPS(flags);

net/mac80211/ht.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void ieee80211_ba_session_work(struct work_struct *work) 
	 * down by the code that set the flag, so this

	 * need not run.

	 */

	if (test_sta_flags(sta, WLAN_STA_BLOCK_BA))

	if (test_sta_flag(sta, WLAN_STA_BLOCK_BA))

		return;



	mutex_lock(&sta->ampdu_mlme.mtx);