summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh.c
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2015-06-09 13:35:33 +0800
committerJohannes Berg <johannes.berg@intel.com>2015-06-09 22:04:25 +0200
commit8df734e865b74d9f273216482a45a38269dc767a (patch)
tree3666e36c18c3565b9474ce4f97e11e58176dd920 /net/mac80211/mesh.c
parentafd2efb91990667cd4d9171a743f8a89e19d5ef1 (diff)
downloadlinux-8df734e865b74d9f273216482a45a38269dc767a.tar.gz
linux-8df734e865b74d9f273216482a45a38269dc767a.tar.bz2
linux-8df734e865b74d9f273216482a45a38269dc767a.zip
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: af296bdb8da4 ("mac80211: move csa counters from sdata to beacon/presp") Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh.c')
-rw-r--r--net/mac80211/mesh.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index d4684242e78b..817098add1d6 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -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;