UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wifi: mac80211: fragment per STA profile correctly 

When fragmenting the ML per STA profile, the element ID should be
IEEE80211_MLE_SUBELEM_PER_STA_PROFILE rather than WLAN_EID_FRAGMENT.

Change the helper function to take the to be used element ID and pass
the appropriate value for each of the fragmentation levels.

Fixes: 81151ce462 ("wifi: mac80211: support MLO authentication/association with one link")
Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230611121219.9b5c793d904b.I7dad952bea8e555e2f3139fbd415d0cd2b3a08c3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Benjamin Berg 2023-06-11 12:14:29 +03:00 committed by Johannes Berg
parent 7b3b9ac899
commit d094482c99
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/ieee80211_i.h
View File

@ -2312,7 +2312,7 @@ ieee802_11_parse_elems(const u8 *start, size_t len, bool action,
return ieee802_11_parse_elems_crc(start, len, action, 0, 0, bss); return ieee802_11_parse_elems_crc(start, len, action, 0, 0, bss);
} }
void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos); void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos, u8 frag_id);
extern const int ieee802_1d_to_ac[8]; extern const int ieee802_1d_to_ac[8];

5
net/mac80211/mlme.c
View File

@ -1372,10 +1372,11 @@ static void ieee80211_assoc_add_ml_elem(struct ieee80211_sub_if_data *sdata,
ieee80211_add_non_inheritance_elem(skb, outer_present_elems, ieee80211_add_non_inheritance_elem(skb, outer_present_elems,
link_present_elems); link_present_elems);
ieee80211_fragment_element(skb, subelem_len); ieee80211_fragment_element(skb, subelem_len,
IEEE80211_MLE_SUBELEM_FRAGMENT);
} }
ieee80211_fragment_element(skb, ml_elem_len); ieee80211_fragment_element(skb, ml_elem_len, WLAN_EID_FRAGMENT);
} }
static int ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) static int ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)

4
net/mac80211/util.c
View File

@ -5049,7 +5049,7 @@ u8 *ieee80211_ie_build_eht_cap(u8 *pos,
return pos; return pos;
} }
void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos) void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos, u8 frag_id)
{ {
unsigned int elem_len; unsigned int elem_len;
@ -5069,7 +5069,7 @@ void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos)
memmove(len_pos + 255 + 3, len_pos + 255 + 1, elem_len); memmove(len_pos + 255 + 3, len_pos + 255 + 1, elem_len);
/* place the fragment ID */ /* place the fragment ID */
len_pos += 255 + 1; len_pos += 255 + 1;
*len_pos = WLAN_EID_FRAGMENT; *len_pos = frag_id;
/* and point to fragment length to update later */ /* and point to fragment length to update later */
len_pos++; len_pos++;
} }