diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-15 09:54:45 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-02-15 09:56:42 +0100 |
| commit | cd882e2fb2e63c80367fc984a2155239710e2801 (patch) | |
| tree | 870cc3a731b541d35e181c85c8b63a1cfcfd279d /drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | |
| parent | 182094411e29fa76b6651f31fd7b941780a45c56 (diff) | |
| parent | b7198383ef2debe748118996f627452281cf27d7 (diff) | |
Merge wireless into wireless-next
There's a conflict already and some upcoming changes
also depend on changes in wireless for being conflict-
free, so pull wireless in to make all that easier.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 8503c5b6c756..229d87a786df 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -3698,6 +3698,9 @@ iwl_mvm_sta_state_notexist_to_none(struct iwl_mvm *mvm, NL80211_TDLS_SETUP); } + if (ret) + return ret; + for_each_sta_active_link(vif, sta, link_sta, i) link_sta->agg.max_rc_amsdu_len = 1; |