Commit d094482c authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

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: 81151ce4 ("wifi: mac80211: support MLO authentication/association with one link")
Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230611121219.9b5c793d904b.I7dad952bea8e555e2f3139fbd415d0cd2b3a08c3@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7b3b9ac8

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



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];

net/mac80211/mlme.c

+3 −2
Original line number Diff line number Diff line
@@ -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,

						   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)

net/mac80211/util.c

+2 −2
Original line number Diff line number Diff line
@@ -5049,7 +5049,7 @@ u8 *ieee80211_ie_build_eht_cap(u8 *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;
@@ -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);

		/* place the fragment ID */

		len_pos += 255 + 1;

		*len_pos = WLAN_EID_FRAGMENT;

		*len_pos = frag_id;

		/* and point to fragment length to update later */

		len_pos++;

	}