developer | 79e690d | 2022-12-13 17:05:25 +0800 | [diff] [blame] | 1 | From 58619705cdbd28520ddf730eba94c3f5dfca04dc Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 3 | Date: Mon, 12 Dec 2022 15:08:10 +0800 |
| 4 | Subject: [PATCH 99901/99901] fix build failed |
| 5 | |
| 6 | --- |
| 7 | include/linux/ieee80211.h | 8 +++----- |
| 8 | net/mac80211/rc80211_minstrel_ht.c | 2 ++ |
| 9 | net/mac80211/wpa.c | 4 ++-- |
| 10 | net/wireless/nl80211.c | 4 ++++ |
| 11 | 4 files changed, 11 insertions(+), 7 deletions(-) |
| 12 | |
| 13 | diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h |
| 14 | index 7969093..6f70394 100644 |
| 15 | --- a/include/linux/ieee80211.h |
| 16 | +++ b/include/linux/ieee80211.h |
| 17 | @@ -310,11 +310,9 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2) |
| 18 | struct ieee80211_hdr { |
| 19 | __le16 frame_control; |
| 20 | __le16 duration_id; |
| 21 | - struct_group(addrs, |
| 22 | - u8 addr1[ETH_ALEN]; |
| 23 | - u8 addr2[ETH_ALEN]; |
| 24 | - u8 addr3[ETH_ALEN]; |
| 25 | - ); |
| 26 | + u8 addr1[ETH_ALEN]; |
| 27 | + u8 addr2[ETH_ALEN]; |
| 28 | + u8 addr3[ETH_ALEN]; |
| 29 | __le16 seq_ctrl; |
| 30 | u8 addr4[ETH_ALEN]; |
| 31 | } __packed __aligned(2); |
| 32 | diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c |
| 33 | index 33001ec..277fec9 100644 |
| 34 | --- a/net/mac80211/rc80211_minstrel_ht.c |
| 35 | +++ b/net/mac80211/rc80211_minstrel_ht.c |
| 36 | @@ -10,7 +10,9 @@ |
| 37 | #include <linux/random.h> |
| 38 | #include <linux/moduleparam.h> |
| 39 | #include <linux/ieee80211.h> |
| 40 | +#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 41 | #include <linux/minmax.h> |
| 42 | +#endif |
| 43 | #include <net/mac80211.h> |
| 44 | #include "rate.h" |
| 45 | #include "sta_info.h" |
| 46 | diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c |
| 47 | index 20f742b..93ec2f3 100644 |
| 48 | --- a/net/mac80211/wpa.c |
| 49 | +++ b/net/mac80211/wpa.c |
| 50 | @@ -351,7 +351,7 @@ static u8 ccmp_gcmp_aad(struct sk_buff *skb, u8 *aad) |
| 51 | * FC | A1 | A2 | A3 | SC | [A4] | [QC] */ |
| 52 | put_unaligned_be16(len_a, &aad[0]); |
| 53 | put_unaligned(mask_fc, (__le16 *)&aad[2]); |
| 54 | - memcpy(&aad[4], &hdr->addrs, 3 * ETH_ALEN); |
| 55 | + memcpy(&aad[4], &hdr->addr1, 3 * ETH_ALEN); |
| 56 | |
| 57 | /* Mask Seq#, leave Frag# */ |
| 58 | aad[22] = *((u8 *) &hdr->seq_ctrl) & 0x0f; |
| 59 | @@ -792,7 +792,7 @@ static void bip_aad(struct sk_buff *skb, u8 *aad) |
| 60 | IEEE80211_FCTL_MOREDATA); |
| 61 | put_unaligned(mask_fc, (__le16 *) &aad[0]); |
| 62 | /* A1 || A2 || A3 */ |
| 63 | - memcpy(aad + 2, &hdr->addrs, 3 * ETH_ALEN); |
| 64 | + memcpy(aad + 2, &hdr->addr1, 3 * ETH_ALEN); |
| 65 | } |
| 66 | |
| 67 | |
| 68 | diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c |
| 69 | index 7ce76e7..d6f836d 100644 |
| 70 | --- a/net/wireless/nl80211.c |
| 71 | +++ b/net/wireless/nl80211.c |
| 72 | @@ -16449,9 +16449,11 @@ static const struct genl_ops nl80211_ops[] = { |
| 73 | /* can be retrieved by unprivileged users */ |
| 74 | .internal_flags = IFLAGS(NL80211_FLAG_NEED_WIPHY), |
| 75 | }, |
| 76 | +#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 77 | }; |
| 78 | |
| 79 | static const struct genl_small_ops nl80211_small_ops[] = { |
| 80 | +#endif |
| 81 | { |
| 82 | .cmd = NL80211_CMD_SET_WIPHY, |
| 83 | .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, |
| 84 | @@ -17288,8 +17290,10 @@ static struct genl_family nl80211_fam __genl_ro_after_init = { |
| 85 | .module = THIS_MODULE, |
| 86 | .ops = nl80211_ops, |
| 87 | .n_ops = ARRAY_SIZE(nl80211_ops), |
| 88 | +#if LINUX_VERSION_IS_GEQ(5,10,0) |
| 89 | .small_ops = nl80211_small_ops, |
| 90 | .n_small_ops = ARRAY_SIZE(nl80211_small_ops), |
| 91 | +#endif |
| 92 | #if LINUX_VERSION_IS_GEQ(6,1,0) |
| 93 | .resv_start_op = NL80211_CMD_REMOVE_LINK_STA + 1, |
| 94 | #endif |
| 95 | -- |
| 96 | 2.18.0 |
| 97 | |