summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-04-10 14:37:48 +0300
committeriwlwifi publisher <>2024-04-17 13:43:56 +0000
commit5b1614913165acd99d2c015d828213fc14b27e57 (patch)
treeb41982f44c14e5636b8b28d423df4db3682555fe
parent4fa4f1bd92305f2ff8844327e6124245bab4ddf7 (diff)
downloadbackport-iwlwifi-5b1614913165acd99d2c015d828213fc14b27e57.tar.gz
wifi: iwlwifi: mvm: use an 'else if' when checking cmd ver
Static analyzer complains about overriding the 'len' before using it. type=cleanup ticket=none Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I88faaae0df4a9c497b499715fec1fcb86ef75e85 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/104325 tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> automatic-review: 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: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/104594 x-iwlwifi-stack-dev: ff54f05df027e2955308dd440d010f9f7da47ada
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
index 4e62d355b7..c6d5b68fea 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
@@ -697,7 +697,7 @@ static int iwl_vendor_set_nic_txpower_limit(struct wiphy *wiphy,
if (cmd_ver == 8)
len = sizeof(mvm->txp_cmd.v8);
- if (cmd_ver == 6)
+ else if (cmd_ver == 6)
len = sizeof(mvm->txp_cmd.v6);
else if (fw_has_api(&mvm->fw->ucode_capa,
IWL_UCODE_TLV_API_REDUCE_TX_POWER))
diff --git a/versions b/versions
index 9c1922fcd7..e21296aee0 100644
--- a/versions
+++ b/versions
@@ -2,5 +2,5 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12059:c868f082"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12060:ff54f05d"
BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40"