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

Commit a42c9fcc authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Emmanuel Grumbach
Browse files

Revert "iwlwifi: remove IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT flag" 



This reverts commit dc9a1929.

3610 cards don't support UAPSD.

Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent b3c063ae

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

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
 *	P2P client interfaces simultaneously if they are in different bindings.

 * @IWL_UCODE_TLV_FLAGS_P2P_BSS_PS_SCM: support power save on BSS station and

 *	P2P client interfaces simultaneously if they are in same bindings.

 * @IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT: General support for uAPSD

 * @IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD: P2P client supports uAPSD power save

 * @IWL_UCODE_TLV_FLAGS_BCAST_FILTERING: uCode supports broadcast filtering.

 * @IWL_UCODE_TLV_FLAGS_GO_UAPSD: AP/GO interfaces support uAPSD clients

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

+7 −0
Original line number Diff line number Diff line
@@ -303,6 +303,13 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&

	    !iwlwifi_mod_params.uapsd_disable) {

		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;

		hw->uapsd_queues = IWL_UAPSD_AC_INFO;

		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}



	hw->sta_data_size = sizeof(struct iwl_mvm_sta);

	hw->vif_data_size = sizeof(struct iwl_mvm_vif);

	hw->chanctx_data_size = sizeof(u16);