summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2014-07-17 16:14:28 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-07-21 12:14:04 +0200
commitbed766bd4cea6413df73e8a314ebf40dd6a920f8 (patch)
tree8dc0dfed80ba079bcd577a15792e274bdbb0d9b2 /net/mac80211
parentmac80211: set Rx highest rate in ht_cap (diff)
downloadlinux-bed766bd4cea6413df73e8a314ebf40dd6a920f8.tar.xz
linux-bed766bd4cea6413df73e8a314ebf40dd6a920f8.zip
mac80211: disable VHT for TDLS
TDLS VHT support requires some more information elements during setup. While these are not there, mask out the peer's VHT capabilities so that VHT rates are not mistakenly used. Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/vht.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index 9265adfdabfc..671ce0d27a80 100644
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -129,6 +129,10 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
if (!vht_cap_ie || !sband->vht_cap.vht_supported)
return;
+ /* don't support VHT for TDLS peers for now */
+ if (test_sta_flag(sta, WLAN_STA_TDLS_PEER))
+ return;
+
/*
* A VHT STA must support 40 MHz, but if we verify that here
* then we break a few things - some APs (e.g. Netgear R6300v2