diff options
| author | David S. Miller <davem@davemloft.net> | 2022-09-04 13:23:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-09-04 13:23:11 +0300 |
| commit | c90714017cb3f197e71c7ff1317335b96d4d19e8 (patch) | |
| tree | 235eed682255dfb37069743f49639fe49b7e30cf /include | |
| parent | d9c0103b9cb0e26272ac4d9a5912ab79e408fa83 (diff) | |
| parent | 2aec909912da55a6e469fd6ee8412080a5433ed2 (diff) | |
| download | linux-c90714017cb3f197e71c7ff1317335b96d4d19e8.tar.xz | |
Merge tag 'wireless-2022-09-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless
Johannes berg says:
====================
We have a handful of fixes:
- fix DMA from stack in wilc1000 driver
- fix crash on chip reset failure in mt7921e
- fix for the reported warning on aggregation timer expiry
- check packet lengths in hwsim virtio paths
- fix compiler warnings/errors with AAD construction by
using struct_group
- fix Intel 4965 driver rate scale operation
- release channel contexts correctly in mac80211 mlme code
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ieee80211.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 55e6f4ad0ca6..b6e6d5b40774 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -310,9 +310,11 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2) struct ieee80211_hdr { __le16 frame_control; __le16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; + struct_group(addrs, + u8 addr1[ETH_ALEN]; + u8 addr2[ETH_ALEN]; + u8 addr3[ETH_ALEN]; + ); __le16 seq_ctrl; u8 addr4[ETH_ALEN]; } __packed __aligned(2); |