diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-09-06 11:05:29 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-09-06 11:05:39 +0300 |
| commit | b38d15294ffe9b87b092d310f321e2d0a9d2b3b2 (patch) | |
| tree | c66f472d033cfbad5b18628d9a2ae52cd25cd9df /include/linux | |
| parent | 9837ec955b46b62d1dd2d00311461a950c50a791 (diff) | |
| parent | 2aec909912da55a6e469fd6ee8412080a5433ed2 (diff) | |
| download | linux-b38d15294ffe9b87b092d310f321e2d0a9d2b3b2.tar.xz | |
Merge remote-tracking branch 'wireless/main' into wireless-next
Merge wireless/main to get the rx.link fix, which is needed
for further work in this area.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux')
| -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 6f70394417ac..79690938d9a2 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); |