summaryrefslogtreecommitdiff
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorIlan Peer <ilan.peer@intel.com>2023-06-16 09:54:07 +0300
committerJohannes Berg <johannes.berg@intel.com>2023-06-19 13:05:29 +0300
commita286de1aa38f7ea6605c770278a1ebf4096c03a2 (patch)
treedd4b158ac9a3241c0bace698e6c71dcb822f8f95 /net/mac80211/util.c
parenta76236de584ac15b2e495a613034a9e031449f7e (diff)
downloadlinux-a286de1aa38f7ea6605c770278a1ebf4096c03a2.tar.xz
wifi: mac80211: Rename multi_link
As a preparation to support Reconfiguration Multi Link element, rename 'multi_link' and 'multi_link_len' fields in 'struct ieee802_11_elems' to 'ml_basic' and 'ml_basic_len'. Signed-off-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> Link: https://lore.kernel.org/r/20230616094949.b11370d3066a.I34280ae3728597056a6a2f313063962206c0d581@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r--net/mac80211/util.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 3752e90cda54..8658c28d684f 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -984,9 +984,9 @@ ieee80211_parse_extension_element(u32 *crc,
break;
case WLAN_EID_EXT_EHT_MULTI_LINK:
if (ieee80211_mle_size_ok(data, len)) {
- elems->multi_link_elem = (void *)elem;
- elems->multi_link = (void *)data;
- elems->multi_link_len = len;
+ elems->ml_basic_elem = (void *)elem;
+ elems->ml_basic = (void *)data;
+ elems->ml_basic_len = len;
}
break;
}
@@ -1462,8 +1462,8 @@ static size_t ieee802_11_find_bssid_profile(const u8 *start, size_t len,
static void ieee80211_mle_get_sta_prof(struct ieee802_11_elems *elems,
u8 link_id)
{
- const struct ieee80211_multi_link_elem *ml = elems->multi_link;
- ssize_t ml_len = elems->multi_link_len;
+ const struct ieee80211_multi_link_elem *ml = elems->ml_basic;
+ ssize_t ml_len = elems->ml_basic_len;
const struct element *sub;
if (!ml || !ml_len)
@@ -1523,14 +1523,14 @@ static void ieee80211_mle_parse_link(struct ieee802_11_elems *elems,
.from_ap = params->from_ap,
.link_id = -1,
};
- ssize_t ml_len = elems->multi_link_len;
+ ssize_t ml_len = elems->ml_basic_len;
const struct element *non_inherit = NULL;
const u8 *end;
if (params->link_id == -1)
return;
- ml_len = cfg80211_defragment_element(elems->multi_link_elem,
+ ml_len = cfg80211_defragment_element(elems->ml_basic_elem,
elems->ie_start,
elems->total_len,
elems->scratch_pos,
@@ -1542,9 +1542,8 @@ static void ieee80211_mle_parse_link(struct ieee802_11_elems *elems,
if (ml_len < 0)
return;
- elems->multi_link = (const void *)elems->scratch_pos;
- elems->multi_link_len = ml_len;
- elems->scratch_pos += ml_len;
+ elems->ml_basic = (const void *)elems->scratch_pos;
+ elems->ml_basic_len = ml_len;
ieee80211_mle_get_sta_prof(elems, params->link_id);
prof = elems->prof;