summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-03-11 11:09:04 +0200
committeriwlwifi publisher <>2024-04-17 13:10:18 +0000
commit7227c8ae773f2f99d266b38df84e7084651bf9a3 (patch)
treebd64d2420ab2d1514aa1fe5bb780ef1ed7ce00bf
parent2f2c005cde1ee723b074f1a6f5ad5ac83ce42b27 (diff)
downloadbackport-iwlwifi-7227c8ae773f2f99d266b38df84e7084651bf9a3.tar.gz
wifi: iwlwifi: remove 6 GHz NVM override
We shouldn't override the flags to zero here for 6 GHz capable devices any more, but since LAR will be there, this also shouldn't make a difference now. type=cleanup ticket=none Signed-off-by: Johannes Berg <johannes.berg@intel.com> Change-Id: I1ae23a509fad252c0237e74defba6cb74b6ca188 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98499 automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> x-iwlwifi-stack-dev: 16e43274561f0f64e89f23ab05e1a102647824e5
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c5
-rw-r--r--versions2
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 289cffb42b..b4e18dccc6 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@ -475,11 +475,6 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
else
channel->flags = 0;
- /* TODO: Don't put limitations on UHB devices as we still don't
- * have NVM for them
- */
- if (cfg->uhb_supported)
- channel->flags = 0;
iwl_nvm_print_channel_flags(dev, IWL_DL_EEPROM,
channel->hw_value, ch_flags);
IWL_DEBUG_EEPROM(dev, "Ch. %d: %ddBm\n",
diff --git a/versions b/versions
index 8aa6f721d1..9e63473b89 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12001:d05093dd"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12002:16e43274"