diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-01-15 16:05:21 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-15 16:05:21 +0100 |
commit | 97d910d0aaa619ca530d08e2b1125b8014ccb030 (patch) | |
tree | 625396ac9ea52d46b9153f334ed7dcec77db8ee3 /net/wireless/util.c | |
parent | f89903d53f4d39577be98940f7cfa49d66f86db5 (diff) | |
download | op-kernel-dev-97d910d0aaa619ca530d08e2b1125b8014ccb030.zip op-kernel-dev-97d910d0aaa619ca530d08e2b1125b8014ccb030.tar.gz |
cfg80211: remove 80+80 MHz rate reporting
These rates are treated the same as 160 MHz in the spec, so
it makes no sense to distinguish them. As no driver uses them
yet, this is also not a problem, just remove them.
In the userspace API the field remains reserved to preserve
API and ABI.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r-- | net/wireless/util.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index d0ac795..6942d48 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1073,8 +1073,7 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate) if (WARN_ON_ONCE(rate->mcs > 9)) return 0; - idx = rate->flags & (RATE_INFO_FLAGS_160_MHZ_WIDTH | - RATE_INFO_FLAGS_80P80_MHZ_WIDTH) ? 3 : + idx = rate->flags & RATE_INFO_FLAGS_160_MHZ_WIDTH ? 3 : rate->flags & RATE_INFO_FLAGS_80_MHZ_WIDTH ? 2 : rate->flags & RATE_INFO_FLAGS_40_MHZ_WIDTH ? 1 : 0; |