diff options
| author | Miri Korenblit <miriam.rachel.korenblit@intel.com> | 2024-03-31 15:02:11 +0300 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:42:15 +0000 |
| commit | 23ac31df39d2c9dbd5814eed7bf332d23ede2cf4 (patch) | |
| tree | b7d6db2283de735a5f7a4b08cf0c8f056e62495a | |
| parent | 4c86be0dffe1c086eba94b55163439269da82852 (diff) | |
| download | backport-iwlwifi-23ac31df39d2c9dbd5814eed7bf332d23ede2cf4.tar.gz | |
[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 <miriam.rachel.korenblit@intel.com>
Change-Id: I4c4931021be74a67a869384c8f8ee7463e0c7857
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/102174
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: Ilan Peer <ilan.peer@intel.com>
(cherry picked from commit 7fd3996b1b4be3c74189efc9e2f4998850b288dd)
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/102882
x-iwlwifi-stack-dev: bcd9b42bef5622984e470779f366902e3d135202
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 3 | ||||
| -rw-r--r-- | 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); @@ -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" |