summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-11-11 18:11:22 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-11-19 18:46:30 +0100
commit8b1956f0416f10c2362532a9f87c9f1afc70347c (patch)
tree527ada95b457129ddffcfce969066a4cc641cca6 /net
parent339467b906f599b6f3a479dffe7f5bb0241b78ac (diff)
downloadlinux-8b1956f0416f10c2362532a9f87c9f1afc70347c.tar.gz
linux-8b1956f0416f10c2362532a9f87c9f1afc70347c.tar.bz2
linux-8b1956f0416f10c2362532a9f87c9f1afc70347c.zip
mac80211: don't allow 40MHz tx rates in case of 20MHz chandef
When 20MHz chandef is used, 40MHz rates shouldn't be used (by the rate-control algorithm), even if the sta ht capabilities indicate support for it. Signed-off-by: Eliad Peller <eliadx.peller@intel.com> Singed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/vht.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index 671ce0d27a80..bc9e8fc48785 100644
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -287,6 +287,8 @@ enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta)
/* fall through */
case NL80211_CHAN_WIDTH_20_NOHT:
case NL80211_CHAN_WIDTH_20:
+ bw = IEEE80211_STA_RX_BW_20;
+ break;
case NL80211_CHAN_WIDTH_40:
bw = sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ?
IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20;