summaryrefslogtreecommitdiff
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2015-06-09 13:35:33 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 09:29:15 -0700
commit80879086fee9a4bb608689d3e0dc2ddb184aa48b (patch)
tree912824267b7cd9db42d03dfeac535a3d37a39f95 /net/mac80211/cfg.c
parentae41bfc68161ea5d280091ccb9593e9f68d5db44 (diff)
downloadlwn-80879086fee9a4bb608689d3e0dc2ddb184aa48b.tar.gz
lwn-80879086fee9a4bb608689d3e0dc2ddb184aa48b.zip
mac80211: fix the beacon csa counter for mesh and ibss
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") Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ff347a0eebd4..f06d42267306 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3356,6 +3356,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;