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

Commit 8df734e8 authored by Chun-Yeow Yeoh's avatar Chun-Yeow Yeoh Committed by Johannes Berg
Browse files

mac80211: fix the beacon csa counter for mesh and ibss 



The csa counter has moved from sdata to beacon/presp but
it is not updated accordingly for mesh and ibss. Fix this.

Fixes: af296bdb ("mac80211: move csa counters from sdata to beacon/presp")
Signed-off-by: default avatarChun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent afd2efb9

net/mac80211/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -3437,6 +3437,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
	/* Update CSA counters */

	if (sdata->vif.csa_active &&

	    (sdata->vif.type == NL80211_IFTYPE_AP ||

	     sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||

	     sdata->vif.type == NL80211_IFTYPE_ADHOC) &&

	    params->n_csa_offsets) {

		int i;

net/mac80211/ibss.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ ieee80211_ibss_build_presp(struct ieee80211_sub_if_data *sdata, 
				csa_settings->chandef.chan->center_freq);

		presp->csa_counter_offsets[0] = (pos - presp->head);

		*pos++ = csa_settings->count;

		presp->csa_current_counter = csa_settings->count;

	}



	/* put the remaining rates in WLAN_EID_EXT_SUPP_RATES */

net/mac80211/mesh.c

+1 −0
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) 
		*pos++ = 0x0;

		*pos++ = ieee80211_frequency_to_channel(

				csa->settings.chandef.chan->center_freq);

		bcn->csa_current_counter = csa->settings.count;

		bcn->csa_counter_offsets[0] = hdr_len + 6;

		*pos++ = csa->settings.count;

		*pos++ = WLAN_EID_CHAN_SWITCH_PARAM;