History

mac80211: parse also the RSNXE IE

Parse also the RSN Extension IE when parsing the rest of the IEs. It will be used in a later patch.

Shaul Triebitz committed 6 years ago

Commit c0058df1 parent ff74c513 files · +16 −1Browse files

Unified · Split

3 files
  1. include/linux/ieee80211.h +8 −0
  2. net/mac80211/ieee80211_i.h +2 −0
  3. net/mac80211/util.c +6 −1
include/linux/ieee80211.h+8−0
@@ -2532,6 +2532,7 @@ enum ieee80211_eid { · 2531 unmodified lines
25322532 WLAN_EID_FILS_INDICATION = 240,
25332533 WLAN_EID_DILS = 241,
25342534 WLAN_EID_FRAGMENT = 242,
2535+ WLAN_EID_RSNX = 244,
25352536 WLAN_EID_EXTENSION = 255
25362537 };
25372538
@@ -3421,4 +3422,11 @@ static inline bool for_each_element_completed(const struct element *element, · 883 unmodified lines
34213422 return (const u8 *)element == (const u8 *)data + datalen;
34223423 }
34233424
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+
34243432 #endif /* LINUX_IEEE80211_H */
net/mac80211/ieee80211_i.h+2−0
@@ -1472,6 +1472,7 @@ struct ieee802_11_elems { · 1471 unmodified lines
14721472 const struct ieee80211_tim_ie *tim;
14731473 const u8 *challenge;
14741474 const u8 *rsn;
1475+ const u8 *rsnx;
14751476 const u8 *erp_info;
14761477 const u8 *ext_supp_rates;
14771478 const u8 *wmm_info;
@@ -1519,6 +1520,7 @@ struct ieee802_11_elems { · 41 unmodified lines
15191520 u8 tim_len;
15201521 u8 challenge_len;
15211522 u8 rsn_len;
1523+ u8 rsnx_len;
15221524 u8 ext_supp_rates_len;
15231525 u8 wmm_info_len;
15241526 u8 wmm_param_len;
net/mac80211/util.c+6−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
77 * Copyright 2013-2014 Intel Mobile Communications GmbH
88 * Copyright (C) 2015-2017 Intel Deutschland GmbH
9− * Copyright (C) 2018-2019 Intel Corporation
9+ * Copyright (C) 2018-2020 Intel Corporation
1010 *
1111 * utilities for mac80211
1212 */
@@ -994,6 +994,7 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, · 981 unmodified lines
994994 case WLAN_EID_CHAN_SWITCH_TIMING:
995995 case WLAN_EID_LINK_ID:
996996 case WLAN_EID_BSS_MAX_IDLE_PERIOD:
997+ case WLAN_EID_RSNX:
997998 /*
998999 * not listing WLAN_EID_CHANNEL_SWITCH_WRAPPER -- it seems possible
9991000 * 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
12641265 if (elen >= sizeof(*elems->max_idle_period_ie))
12651266 elems->max_idle_period_ie = (void *)pos;
12661267 break;
1268+ case WLAN_EID_RSNX:
1269+ elems->rsnx = pos;
1270+ elems->rsnx_len = elen;
1271+ break;
12671272 case WLAN_EID_EXTENSION:
12681273 ieee80211_parse_extension_element(calc_crc ?
12691274 &crc : NULL,

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