summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2015-09-04 04:58:05 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-09-22 15:21:24 +0200
commitf020ae40b0c969d3fd3b320d0a05e62d5553ff72 (patch)
tree3a24d4d42730c9e3643ce5000bc0190535c15840 /net
parentmac80211: allow the driver to advertise A-MSDU within A-MPDU Rx support (diff)
downloadlinux-f020ae40b0c969d3fd3b320d0a05e62d5553ff72.tar.xz
linux-f020ae40b0c969d3fd3b320d0a05e62d5553ff72.zip
mac80211: zero center freq segment 2 in VHT oper IE
Clear the Channel Center Frequency Segment 2 in VHT operation IEs to avoid sending non-zero values if the SKB wasn't zeroed before adding the VHT operation IE. Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> [change commit message a bit - not necessarily just mesh related] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 1104421bc525..f16705675339 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2324,6 +2324,8 @@ u8 *ieee80211_ie_build_vht_oper(u8 *pos, struct ieee80211_sta_vht_cap *vht_cap,
if (chandef->center_freq2)
vht_oper->center_freq_seg2_idx =
ieee80211_frequency_to_channel(chandef->center_freq2);
+ else
+ vht_oper->center_freq_seg2_idx = 0x00;
switch (chandef->width) {
case NL80211_CHAN_WIDTH_160: