diff options
Diffstat (limited to 'iwlwifi-exclude-GEO-SAR-support-for-3168.patch')
| -rw-r--r-- | iwlwifi-exclude-GEO-SAR-support-for-3168.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/iwlwifi-exclude-GEO-SAR-support-for-3168.patch b/iwlwifi-exclude-GEO-SAR-support-for-3168.patch deleted file mode 100644 index 7578695a8..000000000 --- a/iwlwifi-exclude-GEO-SAR-support-for-3168.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 12e36d98d3e5acf5fc57774e0a15906d55f30cb9 Mon Sep 17 00:00:00 2001 -From: Luca Coelho <luciano.coelho@intel.com> -Date: Tue, 8 Oct 2019 13:10:53 +0300 -Subject: iwlwifi: exclude GEO SAR support for 3168 - -We currently support two NICs in FW version 29, namely 7265D and 3168. -Out of these, only 7265D supports GEO SAR, so adjust the function that -checks for it accordingly. - -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> -Fixes: f5a47fae6aa3 ("iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support") -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> ---- - drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -index 0d2229319261..d9eb2b286438 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -@@ -899,15 +899,17 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm) - * firmware versions. Unfortunately, we don't have a TLV API - * flag to rely on, so rely on the major version which is in - * the first byte of ucode_ver. This was implemented -- * initially on version 38 and then backported to29 and 17. -- * The intention was to have it in 36 as well, but not all -- * 8000 family got this feature enabled. The 8000 family is -- * the only one using version 36, so skip this version -- * entirely. -+ * initially on version 38 and then backported to 17. It was -+ * also backported to 29, but only for 7265D devices. The -+ * intention was to have it in 36 as well, but not all 8000 -+ * family got this feature enabled. The 8000 family is the -+ * only one using version 36, so skip this version entirely. - */ - return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 || -- IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 || -- IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17; -+ IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17 || -+ (IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 && -+ ((mvm->trans->hw_rev & CSR_HW_REV_TYPE_MSK) == -+ CSR_HW_REV_TYPE_7265D)); - } - - int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm) --- -cgit 1.2-0.3.lf.el7 |