Commit 98ea9d59 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: s/IWL_MVM_INVALID_STA/IWL_INVALID_STA 



This is not mvm specific

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241028135215.acb45e8c4a78.I58736fd85d82a1fe641e75037b77878854a91e50@changeid


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

drivers/net/wireless/intel/iwlwifi/fw/api/location.h

+13 −13
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ enum iwl_location_cipher { 
 * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of

 *	the number of measurement iterations (min 2^0 = 1, max 2^14)

 * @sta_id: the station id of the AP. Only relevant when associated to the AP,

 *	otherwise should be set to &IWL_MVM_INVALID_STA.

 *	otherwise should be set to &IWL_INVALID_STA.

 * @cipher: pairwise cipher suite for secured measurement.

 *          &enum iwl_location_cipher.

 * @hltk: HLTK to be used for secured 11az measurement
@@ -818,7 +818,7 @@ struct iwl_tof_range_req_ap_entry_v6 { 
 * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of

 *	the number of measurement iterations (min 2^0 = 1, max 2^14)

 * @sta_id: the station id of the AP. Only relevant when associated to the AP,

 *	otherwise should be set to &IWL_MVM_INVALID_STA.

 *	otherwise should be set to &IWL_INVALID_STA.

 * @cipher: pairwise cipher suite for secured measurement.

 *          &enum iwl_location_cipher.

 * @hltk: HLTK to be used for secured 11az measurement
@@ -831,10 +831,10 @@ struct iwl_tof_range_req_ap_entry_v6 { 
 *	&IWL_INITIATOR_AP_FLAGS_TB is set.

 * @rx_pn: the next expected PN for protected management frames Rx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 * @tx_pn: the next PN to use for protected management frames Tx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 */

struct iwl_tof_range_req_ap_entry_v7 {

	__le32 initiator_ap_flags;
@@ -876,7 +876,7 @@ struct iwl_tof_range_req_ap_entry_v7 { 
 * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of

 *	the number of measurement iterations (min 2^0 = 1, max 2^14)

 * @sta_id: the station id of the AP. Only relevant when associated to the AP,

 *	otherwise should be set to &IWL_MVM_INVALID_STA.

 *	otherwise should be set to &IWL_INVALID_STA.

 * @cipher: pairwise cipher suite for secured measurement.

 *          &enum iwl_location_cipher.

 * @hltk: HLTK to be used for secured 11az measurement
@@ -889,10 +889,10 @@ struct iwl_tof_range_req_ap_entry_v7 { 
 *	&IWL_INITIATOR_AP_FLAGS_TB is set.

 * @rx_pn: the next expected PN for protected management frames Rx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 * @tx_pn: the next PN to use for protected management frames Tx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 * @r2i_ndp_params: parameters for R2I NDP ranging negotiation.

 *      bits 0 - 2: max LTF repetitions

 *      bits 3 - 5: max number of spatial streams
@@ -950,7 +950,7 @@ struct iwl_tof_range_req_ap_entry_v8 { 
 * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of

 *	the number of measurement iterations (min 2^0 = 1, max 2^14)

 * @sta_id: the station id of the AP. Only relevant when associated to the AP,

 *	otherwise should be set to &IWL_MVM_INVALID_STA.

 *	otherwise should be set to &IWL_INVALID_STA.

 * @cipher: pairwise cipher suite for secured measurement.

 *          &enum iwl_location_cipher.

 * @hltk: HLTK to be used for secured 11az measurement
@@ -965,10 +965,10 @@ struct iwl_tof_range_req_ap_entry_v8 { 
 *	&IWL_INITIATOR_AP_FLAGS_TB or &IWL_INITIATOR_AP_FLAGS_NON_TB is set.

 * @rx_pn: the next expected PN for protected management frames Rx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 * @tx_pn: the next PN to use for protected management frames Tx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 * @r2i_ndp_params: parameters for R2I NDP ranging negotiation.

 *      bits 0 - 2: max LTF repetitions

 *      bits 3 - 5: max number of spatial streams
@@ -1033,7 +1033,7 @@ struct iwl_tof_range_req_ap_entry_v9 { 
 * @num_of_bursts: Recommended value to be sent to the AP. 2s Exponent of

 *	the number of measurement iterations (min 2^0 = 1, max 2^14)

 * @sta_id: the station id of the AP. Only relevant when associated to the AP,

 *	otherwise should be set to &IWL_MVM_INVALID_STA.

 *	otherwise should be set to &IWL_INVALID_STA.

 * @cipher: pairwise cipher suite for secured measurement.

 *          &enum iwl_location_cipher.

 * @hltk: HLTK to be used for secured 11az measurement
@@ -1046,10 +1046,10 @@ struct iwl_tof_range_req_ap_entry_v9 { 
 *	&IWL_INITIATOR_AP_FLAGS_TB is set.

 * @rx_pn: the next expected PN for protected management frames Rx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 * @tx_pn: the next PN to use for protected management frames Tx. LE byte

 *	order. Only valid if &IWL_INITIATOR_AP_FLAGS_SECURED is set and sta_id

 *	is set to &IWL_MVM_INVALID_STA.

 *	is set to &IWL_INVALID_STA.

 * @r2i_ndp_params: parameters for R2I NDP ranging negotiation.

 *      bits 0 - 2: max LTF repetitions

 *      bits 3 - 5: max number of spatial streams

drivers/net/wireless/intel/iwlwifi/fw/api/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define NUM_MAC_INDEX_CDB	(NUM_MAC_INDEX_DRIVER + 2)



#define IWL_STATION_COUNT_MAX	16

#define IWL_MVM_INVALID_STA		0xFF

#define IWL_INVALID_STA		0xFF



enum iwl_ac {

	AC_BK,

drivers/net/wireless/intel/iwlwifi/mvm/coex.c

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	 * Rssi update while not associated - can happen since the statistics

	 * are handled asynchronously

	 */

	if (mvmvif->deflink.ap_sta_id == IWL_MVM_INVALID_STA)

	if (mvmvif->deflink.ap_sta_id == IWL_INVALID_STA)

		return;



	/* No BT - reports should be disabled */

drivers/net/wireless/intel/iwlwifi/mvm/d3.c

+2 −2
Original line number Diff line number Diff line
@@ -1306,7 +1306,7 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, 
		goto out_noreset;

	}



	if (mvm_link->ap_sta_id == IWL_MVM_INVALID_STA) {

	if (mvm_link->ap_sta_id == IWL_INVALID_STA) {

		/* if we're not associated, this must be netdetect */

		if (!wowlan->nd_config) {

			ret = 1;
@@ -3156,7 +3156,7 @@ iwl_mvm_choose_query_wakeup_reasons(struct iwl_mvm *mvm, 
	/* if FW uses status notification, status shouldn't be NULL here */

	if (!d3_data->status) {

		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

		u8 sta_id = mvm->net_detect ? IWL_MVM_INVALID_STA :

		u8 sta_id = mvm->net_detect ? IWL_INVALID_STA :

					      mvmvif->deflink.ap_sta_id;



		/* bug - FW with MLO has status notification */

drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file, 
				 mvmvif->deflink.queue_params[i].uapsd);



	if (vif->type == NL80211_IFTYPE_STATION &&

	    ap_sta_id != IWL_MVM_INVALID_STA) {

	    ap_sta_id != IWL_INVALID_STA) {

		struct iwl_mvm_sta *mvm_sta;



		mvm_sta = iwl_mvm_sta_from_staid_protected(mvm, ap_sta_id);