Parse also the RSN Extension IE when parsing the rest of the IEs. It will be used in a later patch.
Unified · Split
| @@ -2532,6 +2532,7 @@ enum ieee80211_eid { · 2531 unmodified lines | |||
| 2532 | WLAN_EID_FILS_INDICATION = 240, | 2532 | WLAN_EID_FILS_INDICATION = 240, |
| 2533 | WLAN_EID_DILS = 241, | 2533 | WLAN_EID_DILS = 241, |
| 2534 | WLAN_EID_FRAGMENT = 242, | 2534 | WLAN_EID_FRAGMENT = 242, |
| 2535 | WLAN_EID_RSNX = 244, | ||
| 2535 | WLAN_EID_EXTENSION = 255 | 2536 | WLAN_EID_EXTENSION = 255 |
| 2536 | }; | 2537 | }; |
| 2537 | 2538 | ||
| @@ -3421,4 +3422,11 @@ static inline bool for_each_element_completed(const struct element *element, · 883 unmodified lines | |||
| 3421 | return (const u8 *)element == (const u8 *)data + datalen; | 3422 | return (const u8 *)element == (const u8 *)data + datalen; |
| 3422 | } | 3423 | } |
| 3423 | 3424 | ||
| 3425 | /** | ||
| 3426 | * RSNX Capabilities: | ||
| 3427 | * bits 0-3: Field length (n-1) | ||
| 3428 | */ | ||
| 3429 | #define WLAN_RSNX_CAPA_PROTECTED_TWT BIT(4) | ||
| 3430 | #define WLAN_RSNX_CAPA_SAE_H2E BIT(5) | ||
| 3431 | |||
| 3424 | #endif /* LINUX_IEEE80211_H */ | 3432 | #endif /* LINUX_IEEE80211_H */ |
| @@ -1472,6 +1472,7 @@ struct ieee802_11_elems { · 1471 unmodified lines | |||
| 1472 | const struct ieee80211_tim_ie *tim; | 1472 | const struct ieee80211_tim_ie *tim; |
| 1473 | const u8 *challenge; | 1473 | const u8 *challenge; |
| 1474 | const u8 *rsn; | 1474 | const u8 *rsn; |
| 1475 | const u8 *rsnx; | ||
| 1475 | const u8 *erp_info; | 1476 | const u8 *erp_info; |
| 1476 | const u8 *ext_supp_rates; | 1477 | const u8 *ext_supp_rates; |
| 1477 | const u8 *wmm_info; | 1478 | const u8 *wmm_info; |
| @@ -1519,6 +1520,7 @@ struct ieee802_11_elems { · 41 unmodified lines | |||
| 1519 | u8 tim_len; | 1520 | u8 tim_len; |
| 1520 | u8 challenge_len; | 1521 | u8 challenge_len; |
| 1521 | u8 rsn_len; | 1522 | u8 rsn_len; |
| 1523 | u8 rsnx_len; | ||
| 1522 | u8 ext_supp_rates_len; | 1524 | u8 ext_supp_rates_len; |
| 1523 | u8 wmm_info_len; | 1525 | u8 wmm_info_len; |
| 1524 | u8 wmm_param_len; | 1526 | u8 wmm_param_len; |
| @@ -6,7 +6,7 @@ · 5 unmodified lines | |||
| 6 | * Copyright 2007 Johannes Berg <johannes@sipsolutions.net> | 6 | * Copyright 2007 Johannes Berg <johannes@sipsolutions.net> |
| 7 | * Copyright 2013-2014 Intel Mobile Communications GmbH | 7 | * Copyright 2013-2014 Intel Mobile Communications GmbH |
| 8 | * Copyright (C) 2015-2017 Intel Deutschland GmbH | 8 | * Copyright (C) 2015-2017 Intel Deutschland GmbH |
| 9 | * Copyright (C) 2018-2019 Intel Corporation | 9 | * Copyright (C) 2018-2020 Intel Corporation |
| 10 | * | 10 | * |
| 11 | * utilities for mac80211 | 11 | * utilities for mac80211 |
| 12 | */ | 12 | */ |
| @@ -994,6 +994,7 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, · 981 unmodified lines | |||
| 994 | case WLAN_EID_CHAN_SWITCH_TIMING: | 994 | case WLAN_EID_CHAN_SWITCH_TIMING: |
| 995 | case WLAN_EID_LINK_ID: | 995 | case WLAN_EID_LINK_ID: |
| 996 | case WLAN_EID_BSS_MAX_IDLE_PERIOD: | 996 | case WLAN_EID_BSS_MAX_IDLE_PERIOD: |
| 997 | case WLAN_EID_RSNX: | ||
| 997 | /* | 998 | /* |
| 998 | * not listing WLAN_EID_CHANNEL_SWITCH_WRAPPER -- it seems possible | 999 | * not listing WLAN_EID_CHANNEL_SWITCH_WRAPPER -- it seems possible |
| 999 | * that if the content gets bigger it might be needed more than once | 1000 | * that if the content gets bigger it might be needed more than once |
| @@ -1264,6 +1265,10 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, · 264 unmodified lines | |||
| 1264 | if (elen >= sizeof(*elems->max_idle_period_ie)) | 1265 | if (elen >= sizeof(*elems->max_idle_period_ie)) |
| 1265 | elems->max_idle_period_ie = (void *)pos; | 1266 | elems->max_idle_period_ie = (void *)pos; |
| 1266 | break; | 1267 | break; |
| 1268 | case WLAN_EID_RSNX: | ||
| 1269 | elems->rsnx = pos; | ||
| 1270 | elems->rsnx_len = elen; | ||
| 1271 | break; | ||
| 1267 | case WLAN_EID_EXTENSION: | 1272 | case WLAN_EID_EXTENSION: |
| 1268 | ieee80211_parse_extension_element(calc_crc ? | 1273 | ieee80211_parse_extension_element(calc_crc ? |
| 1269 | &crc : NULL, | 1274 | &crc : NULL, |