History

Merge tag 'mac80211-next-for-davem-2019-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says: ==================== We have a reasonably large number of changes: * lots more HE (802.11ax) support, particularly things relevant for the the AP side, but also mesh support * debugfs cleanups from Greg * some more work on extended key ID * start using genl parallel_ops, as preparation for weaning ourselves off RTNL and getting parallelism * various other changes all over ====================

David S. Miller committed 7 years ago

Commit ac5fe222 parents 164f0de f39b07f40 files · +1070 −374Browse files

Showing the changes to include/linux (1 of 40 files). Show all

Unified · Split

include/linux/ieee80211.h+61−2
@@ -881,6 +881,14 @@ struct ieee80211_tpc_report_ie { · 880 unmodified lines
881881 u8 link_margin;
882882 } __packed;
883883
884+#define IEEE80211_ADDBA_EXT_FRAG_LEVEL_MASK GENMASK(2, 1)
885+#define IEEE80211_ADDBA_EXT_FRAG_LEVEL_SHIFT 1
886+#define IEEE80211_ADDBA_EXT_NO_FRAG BIT(0)
887+
888+struct ieee80211_addba_ext_ie {
889+ u8 data;
890+} __packed;
891+
884892 struct ieee80211_mgmt {
885893 __le16 frame_control;
886894 __le16 duration;
@@ -973,6 +981,8 @@ struct ieee80211_mgmt { · 86 unmodified lines
973981 __le16 capab;
974982 __le16 timeout;
975983 __le16 start_seq_num;
984+ /* followed by BA Extension */
985+ u8 variable[0];
976986 } __packed addba_req;
977987 struct{
978988 u8 action_code;
@@ -1625,6 +1635,18 @@ struct ieee80211_he_operation { · 646 unmodified lines
16251635 u8 optional[0];
16261636 } __packed;
16271637
1638+/**
1639+ * struct ieee80211_he_spr - HE spatial reuse element
1640+ *
1641+ * This structure is the "HE spatial reuse element" element as
1642+ * described in P802.11ax_D4.0 section 9.4.2.241
1643+ */
1644+struct ieee80211_he_spr {
1645+ u8 he_sr_control;
1646+ /* Optional 0 to 19 bytes: depends on @he_sr_control */
1647+ u8 optional[0];
1648+} __packed;
1649+
16281650 /**
16291651 * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field
16301652 *
@@ -2033,8 +2055,8 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) · 402 unmodified lines
20332055 * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size
20342056 * @he_oper_ie: byte data of the He Operations IE, stating from the the byte
20352057 * after the ext ID byte. It is assumed that he_oper_ie has at least
2036− * sizeof(struct ieee80211_he_operation) bytes, checked already in
2037− * ieee802_11_parse_elems_crc()
2058+ * sizeof(struct ieee80211_he_operation) bytes, the caller must have
2059+ * validated this.
20382060 * @return the actual size of the IE data (not including header), or 0 on error
20392061 */
20402062 static inline u8
@@ -2063,6 +2085,42 @@ ieee80211_he_oper_size(const u8 *he_oper_ie) · 22 unmodified lines
20632085 return oper_len;
20642086 }
20652087
2088+/* HE Spatial Reuse defines */
2089+#define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT 0x4
2090+#define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT 0x8
2091+
2092+/*
2093+ * ieee80211_he_spr_size - calculate 802.11ax HE Spatial Reuse IE size
2094+ * @he_spr_ie: byte data of the He Spatial Reuse IE, stating from the the byte
2095+ * after the ext ID byte. It is assumed that he_spr_ie has at least
2096+ * sizeof(struct ieee80211_he_spr) bytes, the caller must have validated
2097+ * this
2098+ * @return the actual size of the IE data (not including header), or 0 on error
2099+ */
2100+static inline u8
2101+ieee80211_he_spr_size(const u8 *he_spr_ie)
2102+{
2103+ struct ieee80211_he_spr *he_spr = (void *)he_spr_ie;
2104+ u8 spr_len = sizeof(struct ieee80211_he_spr);
2105+ u32 he_spr_params;
2106+
2107+ /* Make sure the input is not NULL */
2108+ if (!he_spr_ie)
2109+ return 0;
2110+
2111+ /* Calc required length */
2112+ he_spr_params = le32_to_cpu(he_spr->he_sr_control);
2113+ if (he_spr_params & IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT)
2114+ spr_len++;
2115+ if (he_spr_params & IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT)
2116+ spr_len += 18;
2117+
2118+ /* Add the first byte (extension ID) to the total length */
2119+ spr_len++;
2120+
2121+ return spr_len;
2122+}
2123+
20662124 /* Authentication algorithms */
20672125 #define WLAN_AUTH_OPEN 0
20682126 #define WLAN_AUTH_SHARED_KEY 1
@@ -2485,6 +2543,7 @@ enum ieee80211_eid_ext { · 416 unmodified lines
24852543 WLAN_EID_EXT_HE_OPERATION = 36,
24862544 WLAN_EID_EXT_UORA = 37,
24872545 WLAN_EID_EXT_HE_MU_EDCA = 38,
2546+ WLAN_EID_EXT_HE_SPR = 39,
24882547 WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME = 52,
24892548 WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55,
24902549 WLAN_EID_EXT_NON_INHERITANCE = 56,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t