diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-14 07:16:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-14 07:16:08 -0800 |
| commit | b32cb6fcf1f81449a388f3fd2be14454a2c644da (patch) | |
| tree | 8f1341a2efeab11e0bbe263cba47085cbfeea8f0 /include | |
| parent | 907e51e41ad9061b49811750475bfeb75c0f2b3c (diff) | |
| parent | 33181ea7f5a62a17fbe55f0f73428ecb5e686be8 (diff) | |
| download | lwn-b32cb6fcf1f81449a388f3fd2be14454a2c644da.tar.gz lwn-b32cb6fcf1f81449a388f3fd2be14454a2c644da.zip | |
Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just a few fixes:
* avoid running out of tracking space for frames that need
to be reported to userspace by using more bits
* fix beacon handling suppression by adding some relevant
elements to the CRC calculation
* fix quiet mode in action frames
* fix crash in ethtool for virt_wifi and similar
* add a missing policy entry
* fix 160 & 80+80 bandwidth to take local capabilities into
account
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index aa145808e57a..77e6b5a83b06 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1004,12 +1004,11 @@ ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate) struct ieee80211_tx_info { /* common information */ u32 flags; - u8 band; - - u8 hw_queue; - - u16 ack_frame_id:6; - u16 tx_time_est:10; + u32 band:3, + ack_frame_id:13, + hw_queue:4, + tx_time_est:10; + /* 2 free bits */ union { struct { |