From 23ac31df39d2c9dbd5814eed7bf332d23ede2cf4 Mon Sep 17 00:00:00 2001 From: Miri Korenblit Date: Sun, 31 Mar 2024 15:02:11 +0300 Subject: [BUGFIX] wifi: iwlwifi: mvm: return uid from iwl_mvm_build_scan_cmd This function is supposed to return a uid on success, and an errno in failure. But it currently returns the return value of the specific cmd version handler, which in turn returns 0 on success and errno otherwise. This means that on success, iwl_mvm_build_scan_cmd will return 0 regardless if the actual uid. Fix this by returning the uid if the handler succeeded. type=bugfix ticket=none fixes=If9882e08045c74c27146108108b95b363a1b5ea6 Signed-off-by: Miri Korenblit Change-Id: I4c4931021be74a67a869384c8f8ee7463e0c7857 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/102174 tested: iil_jenkins iil_jenkins automatic-review: iil_jenkins iil_jenkins Tested-by: iil_jenkins iil_jenkins Reviewed-by: Ilan Peer (cherry picked from commit 7fd3996b1b4be3c74189efc9e2f4998850b288dd) Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/102882 x-iwlwifi-stack-dev: bcd9b42bef5622984e470779f366902e3d135202 --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 3 ++- versions | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 16f61db0e7..bec9631dc1 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -2768,7 +2768,8 @@ static int iwl_mvm_build_scan_cmd(struct iwl_mvm *mvm, if (ver_handler->version != scan_ver) continue; - return ver_handler->handler(mvm, vif, params, type, uid); + err = ver_handler->handler(mvm, vif, params, type, uid); + return err ? : uid; } err = iwl_mvm_scan_umac(mvm, vif, params, type, uid); diff --git a/versions b/versions index f7049d5923..da91a8f74c 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:12050:88dc5a4b" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12051:bcd9b42b" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" -- cgit 1.2.3-korg