diff options
| author | David S. Miller <davem@davemloft.net> | 2024-04-25 14:18:37 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-04-25 14:18:37 +0300 |
| commit | 46bf0c9ab79426a0012158ef88ec8d7da0403b19 (patch) | |
| tree | f6e4a8712912120de4b3edd3c4a5fd7941b02bc8 /drivers/net/wireless/intel/iwlwifi/mvm/scan.c | |
| parent | 6c9cd59dbcb09a2122b5ce0dfc07c74e6fc00dc0 (diff) | |
| parent | 91112fc6212a9be6f3be636d885df9c17395e1a4 (diff) | |
| download | linux-46bf0c9ab79426a0012158ef88ec8d7da0403b19.tar.xz | |
Merge tag 'wireless-2024-04-23' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless
Johannes berg says:
====================
Fixes for the current cycle:
* ath11k: convert to correct RCU iteration of IPv6 addresses
* iwlwifi: link ID, FW API version, scanning and PASN fixes
* cfg80211: NULL-deref and tracing fixes
* mac80211: connection mode, mesh fast-TX, multi-link and
various other small fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/scan.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index f3e3986b4c72..11559563ae38 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -2813,7 +2813,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); |