diff options
author | Johannes Berg <johannes.berg@intel.com> | 2023-06-19 13:03:51 +0300 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-19 13:04:16 +0300 |
commit | d5a17cfb9875a873474985f630b5061a4f2142b2 (patch) | |
tree | 14e6a9c9064c3a190ff25aa3af61316646acc36d /net/mac80211/mlme.c | |
parent | 707a13c7e488785170a5e7f2467f2823824651e2 (diff) | |
parent | f1a0898b5d6a77d332d036da03bad6fa9770de5b (diff) | |
download | linux-d5a17cfb9875a873474985f630b5061a4f2142b2.tar.xz |
Merge wireless into wireless-next
There are some locking changes that will later otherwise
cause conflicts, so merge wireless into wireless-next to
avoid those.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index fdd80f73e6cb..959695ed7649 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1367,10 +1367,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) |