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

Commit 4cb832d5 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: move IWL_MVM_UAPSD_QUEUES to constants.h 



Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 9474d444

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

+6 −0
Original line number Diff line number Diff line
@@ -65,12 +65,18 @@ 
#ifndef __MVM_CONSTANTS_H

#define __MVM_CONSTANTS_H



#include <linux/ieee80211.h>



#define IWL_MVM_DEFAULT_PS_TX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)

#define IWL_MVM_DEFAULT_PS_RX_DATA_TIMEOUT	(100 * USEC_PER_MSEC)

#define IWL_MVM_WOWLAN_PS_TX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)

#define IWL_MVM_WOWLAN_PS_RX_DATA_TIMEOUT	(10 * USEC_PER_MSEC)

#define IWL_MVM_UAPSD_RX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)

#define IWL_MVM_UAPSD_TX_DATA_TIMEOUT		(50 * USEC_PER_MSEC)

#define IWL_MVM_UAPSD_QUEUES		(IEEE80211_WMM_IE_STA_QOSINFO_AC_VO |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_VI |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_BK |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)

#define IWL_MVM_PS_HEAVY_TX_THLD_PACKETS	20

#define IWL_MVM_PS_HEAVY_RX_THLD_PACKETS	8

#define IWL_MVM_PS_SNOOZE_HEAVY_TX_THLD_PACKETS	30

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

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	    IWL_UCODE_API(mvm->fw->ucode_ver) >= 9 &&

	    !iwlwifi_mod_params.uapsd_disable) {

		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;

		hw->uapsd_queues = IWL_UAPSD_AC_INFO;

		hw->uapsd_queues = IWL_MVM_UAPSD_QUEUES;

		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}

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

+0 −4
Original line number Diff line number Diff line
@@ -180,10 +180,6 @@ enum iwl_power_scheme { 
};



#define IWL_CONN_MAX_LISTEN_INTERVAL	10

#define IWL_UAPSD_AC_INFO		(IEEE80211_WMM_IE_STA_QOSINFO_AC_VO |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_VI |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_BK |\

					 IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)

#define IWL_UAPSD_MAX_SP		IEEE80211_WMM_IE_STA_QOSINFO_SP_2



#ifdef CONFIG_IWLWIFI_DEBUGFS