aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/spectmgmt.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-05-19 13:22:38 +0200
committerJohannes Berg <johannes.berg@intel.com>2017-05-19 13:25:57 +0200
commit61b81b4010496e8e989307cf7ee196f83dd09681 (patch)
treefebb68ca088f3c6de18631a552bfd9eab6fefb9a /net/mac80211/spectmgmt.c
parentmac80211: mesh: mark channel as unusable if a regulatory MESH CSA is received (diff)
downloadlinux-dev-61b81b4010496e8e989307cf7ee196f83dd09681.tar.xz
linux-dev-61b81b4010496e8e989307cf7ee196f83dd09681.zip
mac80211: move clearing result into ieee80211_parse_ch_switch_ie()
Clear the csa_ie in ieee80211_parse_ch_switch_ie() where the data is filled in, rather than in each caller. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/spectmgmt.c')
-rw-r--r--net/mac80211/spectmgmt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c
index d2ea0017c79d..bf8f5dcea1c4 100644
--- a/net/mac80211/spectmgmt.c
+++ b/net/mac80211/spectmgmt.c
@@ -36,6 +36,8 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,
const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie;
int secondary_channel_offset = -1;
+ memset(csa_ie, 0, sizeof(*csa_ie));
+
sec_chan_offs = elems->sec_chan_offs;
wide_bw_chansw_ie = elems->wide_bw_chansw_ie;