diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-11-30 16:10:40 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-11-30 16:11:19 -0800 |
| commit | 975f2d73a99f35b57ffa2ad7bff8562225cdcfcb (patch) | |
| tree | d6c9ce96cfd889281e003a310c79d5a12a3cf924 /drivers/net/wireless/intel | |
| parent | f9893fdac319bb2817e5e7818870264d7fb2eb02 (diff) | |
| parent | 6172a5180fcc65170bfa2d49e55427567860f2a7 (diff) | |
| download | linux-975f2d73a99f35b57ffa2ad7bff8562225cdcfcb.tar.gz linux-975f2d73a99f35b57ffa2ad7bff8562225cdcfcb.tar.bz2 linux-975f2d73a99f35b57ffa2ad7bff8562225cdcfcb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c index ca5e4fbcf8ce..6af606e5da65 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c @@ -707,8 +707,10 @@ int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, rcu_dereference_protected(mvm_sta->link[link_id], lockdep_is_held(&mvm->mutex)); - if (WARN_ON(!link_conf || !mvm_link_sta)) + if (WARN_ON(!link_conf || !mvm_link_sta)) { + ret = -EINVAL; goto err; + } ret = iwl_mvm_mld_cfg_sta(mvm, sta, vif, link_sta, link_conf, mvm_link_sta); |