Commit c870d66f authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: update multi-link element STA reconfig 



Update the MLE STA reconfig sub-type to 802.11be D3.0
format, which includes the operation update field.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230618214436.2e1383b31f07.I8055a111c8fcf22e833e60f5587a4d8d21caca5b@changeid


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

include/linux/ieee80211.h

+6 −2
Original line number Diff line number Diff line
@@ -4893,7 +4893,9 @@ static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data, 
#define IEEE80211_MLE_STA_RECONF_CONTROL_LINK_ID			0x000f

#define IEEE80211_MLE_STA_RECONF_CONTROL_COMPLETE_PROFILE		0x0010

#define IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT		0x0020

#define IEEE80211_MLE_STA_RECONF_CONTROL_DELETE_TIMER_PRESENT		0x0040

#define IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT		0x0040

#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_UPDATE_TYPE		0x0780

#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT	0x0800



/**

 * ieee80211_mle_reconf_sta_prof_size_ok - validate reconfiguration multi-link
@@ -4916,7 +4918,9 @@ static inline bool ieee80211_mle_reconf_sta_prof_size_ok(const u8 *data, 


	if (control & IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT)

		info_len += ETH_ALEN;

	if (control & IEEE80211_MLE_STA_RECONF_CONTROL_DELETE_TIMER_PRESENT)

	if (control & IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT)

		info_len += 2;

	if (control & IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT)

		info_len += 2;



	return prof->sta_info_len >= info_len &&

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -5730,7 +5730,7 @@ static void ieee80211_ml_reconfiguration(struct ieee80211_sub_if_data *sdata, 
		 * is not present assume immediate removal.

		 */

		if (control &

		    IEEE80211_MLE_STA_RECONF_CONTROL_DELETE_TIMER_PRESENT)

		    IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT)

			link_removal_timeout[link_id] = le16_to_cpu(*(__le16 *)pos);

	}