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

Commit 3e2a0226 authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

mac80211: remove redundant IEEE80211_STA_CSA_RECEIVED flag 



The csa_active flag was added in sdata a while ago and made
IEEE80211_STA_CSA_RECEIVED redundant.  The new flag is also used to
mark when CSA is ongoing on other iftypes and took over the old one as
the preferred method for checking whether we're in the middle of a
channel switch.  Remove the old, redundant flag.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent bb3f8486

net/mac80211/ieee80211_i.h

+0 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ enum ieee80211_sta_flags { 
	IEEE80211_STA_CONNECTION_POLL	= BIT(1),

	IEEE80211_STA_CONTROL_PORT	= BIT(2),

	IEEE80211_STA_DISABLE_HT	= BIT(4),

	IEEE80211_STA_CSA_RECEIVED	= BIT(5),

	IEEE80211_STA_MFP_ENABLED	= BIT(6),

	IEEE80211_STA_UAPSD_ENABLED	= BIT(7),

	IEEE80211_STA_NULLFUNC_ACKED	= BIT(8),

net/mac80211/mlme.c

+1 −7
Original line number Diff line number Diff line
@@ -996,8 +996,6 @@ static void ieee80211_chswitch_work(struct work_struct *work) 
		sdata->csa_block_tx = false;

	}



	ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;



	ieee80211_sta_reset_beacon_monitor(sdata);

	ieee80211_sta_reset_conn_monitor(sdata);
@@ -1055,7 +1053,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 
		return;



	/* disregard subsequent announcements if we are already processing */

	if (ifmgd->flags & IEEE80211_STA_CSA_RECEIVED)

	if (sdata->vif.csa_active)

		return;



	current_band = cbss->channel->band;
@@ -1082,8 +1080,6 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 
		return;

	}



	ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;



	mutex_lock(&local->mtx);

	mutex_lock(&local->chanctx_mtx);

	conf = rcu_dereference_protected(sdata->vif.chanctx_conf,
@@ -2099,8 +2095,6 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) 
	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,

			       WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,

			       true, frame_buf);

	ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;



	mutex_lock(&local->mtx);

	sdata->vif.csa_active = false;

	if (sdata->csa_block_tx) {