projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wifi: brcmfmac: p2p: Introduce generic flexible array frame member
[carl9170fw.git]
/
include
/
linux
/
ieee80211.h
diff --git
a/include/linux/ieee80211.h
b/include/linux/ieee80211.h
index 6ad582667c2d5ffd7b695e8a87672374748924dd..a85de3022f53bdc3347f49ec30fcde29fafd7f26 100644
(file)
--- a/
include/linux/ieee80211.h
+++ b/
include/linux/ieee80211.h
@@
-326,6
+326,17
@@
struct ieee80211_qos_hdr {
__le16 qos_ctrl;
} __packed __aligned(2);
__le16 qos_ctrl;
} __packed __aligned(2);
+struct ieee80211_qos_hdr_4addr {
+ __le16 frame_control;
+ __le16 duration_id;
+ u8 addr1[6];
+ u8 addr2[6];
+ u8 addr3[6];
+ __le16 seq_ctrl;
+ u8 addr4[6];
+ __le16 qos_ctrl;
+} __packed __aligned(2);
+
struct ieee80211_trigger {
__le16 frame_control;
__le16 duration;
struct ieee80211_trigger {
__le16 frame_control;
__le16 duration;
@@
-1346,6
+1357,7
@@
struct ieee80211_mgmt {
} __packed wnm_timing_msr;
} u;
} __packed __aligned(4) action;
} __packed wnm_timing_msr;
} u;
} __packed __aligned(4) action;
+ DECLARE_FLEX_ARRAY(u8, body); /* Generic frame body */
} u __aligned(2);
} __packed __aligned(2);
} u __aligned(2);
} __packed __aligned(2);
@@
-4078,16
+4090,21
@@
struct ieee80211_he_6ghz_capa {
* @hdr: the frame
*
* The qos ctrl bytes come after the frame_control, duration, seq_num
* @hdr: the frame
*
* The qos ctrl bytes come after the frame_control, duration, seq_num
- * and 3 or 4 addresses of length ETH_ALEN.
- * 3 addr: 2 + 2 + 2 + 3*6 = 24
- * 4 addr: 2 + 2 + 2 + 4*6 = 30
+ * and 3 or 4 addresses of length ETH_ALEN. Checks frame_control to choose
+ * between struct ieee80211_qos_hdr_4addr and struct ieee80211_qos_hdr.
*/
static inline u8 *ieee80211_get_qos_ctl(struct ieee80211_hdr *hdr)
{
*/
static inline u8 *ieee80211_get_qos_ctl(struct ieee80211_hdr *hdr)
{
- if (ieee80211_has_a4(hdr->frame_control))
- return (u8 *)hdr + 30;
+ union {
+ struct ieee80211_qos_hdr addr3;
+ struct ieee80211_qos_hdr_4addr addr4;
+ } *qos;
+
+ qos = (void *)hdr;
+ if (ieee80211_has_a4(qos->addr3.frame_control))
+ return (u8 *)&qos->addr4.qos_ctrl;
else
else
- return (u8 *)
hdr + 24
;
+ return (u8 *)
&qos->addr3.qos_ctrl
;
}
/**
}
/**
@@
-4521,7
+4538,7
@@
static inline u8 ieee80211_mle_common_size(const u8 *data)
return 0;
}
return 0;
}
- return common + mle->variable[0];
+ return
sizeof(*mle) +
common + mle->variable[0];
}
/**
}
/**
@@
-4529,7
+4546,7
@@
static inline u8 ieee80211_mle_common_size(const u8 *data)
* @data: pointer to the element data
* @len: length of the containing element
*/
* @data: pointer to the element data
* @len: length of the containing element
*/
-static inline bool ieee80211_mle_size_ok(const u8 *data,
u8
len)
+static inline bool ieee80211_mle_size_ok(const u8 *data,
size_t
len)
{
const struct ieee80211_multi_link_elem *mle = (const void *)data;
u8 fixed = sizeof(*mle);
{
const struct ieee80211_multi_link_elem *mle = (const void *)data;
u8 fixed = sizeof(*mle);
@@
-4594,6
+4611,7
@@
static inline bool ieee80211_mle_size_ok(const u8 *data, u8 len)
enum ieee80211_mle_subelems {
IEEE80211_MLE_SUBELEM_PER_STA_PROFILE = 0,
enum ieee80211_mle_subelems {
IEEE80211_MLE_SUBELEM_PER_STA_PROFILE = 0,
+ IEEE80211_MLE_SUBELEM_FRAGMENT = 254,
};
#define IEEE80211_MLE_STA_CONTROL_LINK_ID 0x000f
};
#define IEEE80211_MLE_STA_CONTROL_LINK_ID 0x000f