Skip to contentSkip to conversation

Patch "mac80211: fix the beacon csa counter for mesh and ibss" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Jul 31, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mac80211: fix the beacon csa counter for mesh and ibss

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     mac80211-fix-the-beacon-csa-counter-for-mesh-and-ibss.patch

and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8df734e865b74d9f273216482a45a38269dc767a Mon Sep 17 00:00:00 2001

From: Chun-Yeow Yeoh <[email protected]>
Date: Tue, 9 Jun 2015 13:35:33 +0800
Subject: mac80211: fix the beacon csa counter for mesh and ibss

From: Chun-Yeow Yeoh <[email protected]>

commit 8df734e865b74d9f273216482a45a38269dc767a upstream.

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

Fixes af296bdb8da4 ("mac80211: move csa counters from sdata to beacon/presp")
---
 net/mac80211/cfg.c  |    1 +
 net/mac80211/ibss.c |    1 +
 net/mac80211/mesh.c |    1 +
 3 files changed, 3 insertions(+)
net/mac80211/cfg.c +1 -0
@@ -3356,6 +3356,7 @@ static int ieee80211_mgmt_tx(struct wiph
 	/* 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
@@ -146,6 +146,7 @@ ieee80211_ibss_build_presp(struct ieee80
 				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
@@ -680,6 +680,7 @@ ieee80211_mesh_build_beacon(struct ieee8
 		*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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/mac80211-fix-the-beacon-csa-counter-for-mesh-and-ibss.patch