diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-18 19:00:27 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-18 19:00:27 (GMT) |
| commit | 87305c4cd261664a12cff16740d0c40065bbd07f (patch) | |
| tree | 5fa9a470f011736d0ff728aa54f9f540b2485724 /net/wireless/util.c | |
| parent | 06a77b07e3b44aea2b3c0e64de420ea2cfdcbaa9 (diff) | |
| parent | 9853a55ef1bb66d7411136046060bbfb69c714fa (diff) | |
| download | linux-87305c4cd261664a12cff16740d0c40065bbd07f.tar.xz | |
Merge tag 'mac80211-for-davem-2016-11-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A few more bugfixes:
* limit # of scan results stored in memory - this is a long-standing bug
Jouni and I only noticed while discussing other things in Santa Fe
* revert AP_LINK_PS patch that was causing issues (Felix)
* various A-MSDU/A-MPDU fixes for TXQ code (Felix)
* interoperability workaround for peers with broken VHT capabilities
(Filip Matusiak)
* add bitrate definition for a VHT MCS that's supposed to be invalid
but gets used by some hardware anyway (Thomas Pedersen)
* beacon timer fix in hwsim (Benjamin Beichler)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 5ea12af..659b507 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1158,7 +1158,8 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate) 58500000, 65000000, 78000000, - 0, + /* not in the spec, but some devices use this: */ + 86500000, }, { 13500000, 27000000, |