Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5241b0c authored by Avraham Stern's avatar Avraham Stern Committed by Luca Coelho
Browse files

iwlwifi: rename CAPA_P2P_STANDALONE_UAPSD to CAPA_P2P_SCM_UAPSD 



Ucode capability bit 26 indicates support for UAPSD on P2P interface
even with a simultaneous BSS station interface, as long as both
interfaces are in the same binding. Change the name of the
capability bit to reflect that.

Signed-off-by: default avatarAvraham Stern <avraham.stern@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 7bde4c68

drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h

+3 −2
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_DC2DC_SUPPORT: supports DC2DC Command

 * @IWL_UCODE_TLV_CAPA_CSUM_SUPPORT: supports TCP Checksum Offload

 * @IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS: support radio and beacon statistics

 * @IWL_UCODE_TLV_CAPA_P2P_STANDALONE_UAPSD: support p2p standalone U-APSD

 * @IWL_UCODE_TLV_CAPA_P2P_SCM_UAPSD: supports U-APSD on p2p interface when it

 *	is standalone or with a BSS station interface in the same binding.

 * @IWL_UCODE_TLV_CAPA_BT_COEX_PLCR: enabled BT Coex packet level co-running

 * @IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC: ucode supports LAR updates with different

 *	sources for the MCC. This TLV bit is a future replacement to
@@ -345,7 +346,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_DC2DC_CONFIG_SUPPORT		= (__force iwl_ucode_tlv_capa_t)19,

	IWL_UCODE_TLV_CAPA_CSUM_SUPPORT			= (__force iwl_ucode_tlv_capa_t)21,

	IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS		= (__force iwl_ucode_tlv_capa_t)22,

	IWL_UCODE_TLV_CAPA_P2P_STANDALONE_UAPSD		= (__force iwl_ucode_tlv_capa_t)26,

	IWL_UCODE_TLV_CAPA_P2P_SCM_UAPSD		= (__force iwl_ucode_tlv_capa_t)26,

	IWL_UCODE_TLV_CAPA_BT_COEX_PLCR			= (__force iwl_ucode_tlv_capa_t)28,

	IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC		= (__force iwl_ucode_tlv_capa_t)29,

	IWL_UCODE_TLV_CAPA_BT_COEX_RRC			= (__force iwl_ucode_tlv_capa_t)30,

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

+1 −1
Original line number Diff line number Diff line
@@ -2360,7 +2360,7 @@ static void iwl_mvm_check_uapsd(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT))

		return;



	if (vif->p2p && !iwl_mvm_is_p2p_standalone_uapsd_supported(mvm)) {

	if (vif->p2p && !iwl_mvm_is_p2p_scm_uapsd_supported(mvm)) {

		vif->driver_flags &= ~IEEE80211_VIF_SUPPORTS_UAPSD;

		return;

	}

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+2 −2
Original line number Diff line number Diff line
@@ -1158,10 +1158,10 @@ static inline bool iwl_mvm_is_mplut_supported(struct iwl_mvm *mvm) 
}



static inline

bool iwl_mvm_is_p2p_standalone_uapsd_supported(struct iwl_mvm *mvm)

bool iwl_mvm_is_p2p_scm_uapsd_supported(struct iwl_mvm *mvm)

{

	return fw_has_capa(&mvm->fw->ucode_capa,

			   IWL_UCODE_TLV_CAPA_P2P_STANDALONE_UAPSD) &&

			   IWL_UCODE_TLV_CAPA_P2P_SCM_UAPSD) &&

		!(iwlwifi_mod_params.uapsd_disable &

		  IWL_DISABLE_UAPSD_P2P_CLIENT);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static bool iwl_mvm_power_allow_uapsd(struct iwl_mvm *mvm, 
		/* Allow U-APSD only if p2p is stand alone */

		bool is_p2p_standalone = true;



		if (!iwl_mvm_is_p2p_standalone_uapsd_supported(mvm))

		if (!iwl_mvm_is_p2p_scm_uapsd_supported(mvm))

			return false;



		ieee80211_iterate_active_interfaces_atomic(mvm->hw,