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 ====================
Showing the changes to include/linux (1 of 40 files). Show all
Unified · Split
| @@ -881,6 +881,14 @@ struct ieee80211_tpc_report_ie { · 880 unmodified lines | |||
| 881 | u8 link_margin; | 881 | u8 link_margin; |
| 882 | } __packed; | 882 | } __packed; |
| 883 | 883 | ||
| 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 | |||
| 884 | struct ieee80211_mgmt { | 892 | struct ieee80211_mgmt { |
| 885 | __le16 frame_control; | 893 | __le16 frame_control; |
| 886 | __le16 duration; | 894 | __le16 duration; |
| @@ -973,6 +981,8 @@ struct ieee80211_mgmt { · 86 unmodified lines | |||
| 973 | __le16 capab; | 981 | __le16 capab; |
| 974 | __le16 timeout; | 982 | __le16 timeout; |
| 975 | __le16 start_seq_num; | 983 | __le16 start_seq_num; |
| 984 | /* followed by BA Extension */ | ||
| 985 | u8 variable[0]; | ||
| 976 | } __packed addba_req; | 986 | } __packed addba_req; |
| 977 | struct{ | 987 | struct{ |
| 978 | u8 action_code; | 988 | u8 action_code; |
| @@ -1625,6 +1635,18 @@ struct ieee80211_he_operation { · 646 unmodified lines | |||
| 1625 | u8 optional[0]; | 1635 | u8 optional[0]; |
| 1626 | } __packed; | 1636 | } __packed; |
| 1627 | 1637 | ||
| 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 | |||
| 1628 | /** | 1650 | /** |
| 1629 | * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field | 1651 | * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field |
| 1630 | * | 1652 | * |
| @@ -2033,8 +2055,8 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) · 402 unmodified lines | |||
| 2033 | * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size | 2055 | * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size |
| 2034 | * @he_oper_ie: byte data of the He Operations IE, stating from the the byte | 2056 | * @he_oper_ie: byte data of the He Operations IE, stating from the the byte |
| 2035 | * after the ext ID byte. It is assumed that he_oper_ie has at least | 2057 | * 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 | 2058 | * sizeof(struct ieee80211_he_operation) bytes, the caller must have |
| 2037 | * ieee802_11_parse_elems_crc() | 2059 | * validated this. |
| 2038 | * @return the actual size of the IE data (not including header), or 0 on error | 2060 | * @return the actual size of the IE data (not including header), or 0 on error |
| 2039 | */ | 2061 | */ |
| 2040 | static inline u8 | 2062 | static inline u8 |
| @@ -2063,6 +2085,42 @@ ieee80211_he_oper_size(const u8 *he_oper_ie) · 22 unmodified lines | |||
| 2063 | return oper_len; | 2085 | return oper_len; |
| 2064 | } | 2086 | } |
| 2065 | 2087 | ||
| 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 | |||
| 2066 | /* Authentication algorithms */ | 2124 | /* Authentication algorithms */ |
| 2067 | #define WLAN_AUTH_OPEN 0 | 2125 | #define WLAN_AUTH_OPEN 0 |
| 2068 | #define WLAN_AUTH_SHARED_KEY 1 | 2126 | #define WLAN_AUTH_SHARED_KEY 1 |
| @@ -2485,6 +2543,7 @@ enum ieee80211_eid_ext { · 416 unmodified lines | |||
| 2485 | WLAN_EID_EXT_HE_OPERATION = 36, | 2543 | WLAN_EID_EXT_HE_OPERATION = 36, |
| 2486 | WLAN_EID_EXT_UORA = 37, | 2544 | WLAN_EID_EXT_UORA = 37, |
| 2487 | WLAN_EID_EXT_HE_MU_EDCA = 38, | 2545 | WLAN_EID_EXT_HE_MU_EDCA = 38, |
| 2546 | WLAN_EID_EXT_HE_SPR = 39, | ||
| 2488 | WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME = 52, | 2547 | WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME = 52, |
| 2489 | WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55, | 2548 | WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55, |
| 2490 | WLAN_EID_EXT_NON_INHERITANCE = 56, | 2549 | WLAN_EID_EXT_NON_INHERITANCE = 56, |