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

Commit c6e37a68 authored by Avri Altman's avatar Avri Altman Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: Re-factor enabling uAPSD logic 



The driver can enable uAPSD and specify some of its related parameters.
This patch organizes this logic in a separate function.

Signed-off-by: default avatarAvri Altman <avri.altman@intel.com>
Reviewed-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 3a58d98e

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

+25 −18
Original line number Diff line number Diff line
@@ -268,6 +268,30 @@ static void iwl_mvm_power_configure_uapsd(struct iwl_mvm *mvm, 
		IWL_MVM_PS_HEAVY_RX_THLD_PERCENT;

}



static bool iwl_mvm_power_allow_uapsd(struct iwl_mvm *mvm,

				       struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (!memcmp(mvmvif->uapsd_misbehaving_bssid, vif->bss_conf.bssid,

		    ETH_ALEN))

		return false;



	if (vif->p2p &&

	    !(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD))

		return false;

	/*

	 * Avoid using uAPSD if P2P client is associated to GO that uses

	 * opportunistic power save. This is due to current FW limitation.

	 */

	if (vif->p2p &&

	    (vif->bss_conf.p2p_noa_attr.oppps_ctwindow &

	    IEEE80211_P2P_OPPPS_ENABLE_BIT))

		return false;



	return true;

}



static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,

				    struct ieee80211_vif *vif,

				    struct iwl_mac_power_cmd *cmd)
@@ -280,7 +304,6 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 
	bool radar_detect = false;

	struct iwl_mvm_vif *mvmvif __maybe_unused =

		iwl_mvm_vif_from_mac80211(vif);

	bool allow_uapsd = true;



	cmd->id_and_color = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id,

							    mvmvif->color));
@@ -346,23 +369,7 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 
			cpu_to_le32(IWL_MVM_WOWLAN_PS_TX_DATA_TIMEOUT);

	}



	if (!memcmp(mvmvif->uapsd_misbehaving_bssid, vif->bss_conf.bssid,

		    ETH_ALEN))

		allow_uapsd = false;



	if (vif->p2p &&

	    !(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD))

		allow_uapsd = false;

	/*

	 * Avoid using uAPSD if P2P client is associated to GO that uses

	 * opportunistic power save. This is due to current FW limitation.

	 */

	if (vif->p2p &&

	    vif->bss_conf.p2p_noa_attr.oppps_ctwindow &

	    IEEE80211_P2P_OPPPS_ENABLE_BIT)

		allow_uapsd = false;



	if (allow_uapsd)

	if (iwl_mvm_power_allow_uapsd(mvm, vif))

		iwl_mvm_power_configure_uapsd(mvm, vif, cmd);



#ifdef CONFIG_IWLWIFI_DEBUGFS