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/rxmq.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/rxmq.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c index b7639e429889..1484eaedf452 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c @@ -512,6 +512,10 @@ static bool iwl_mvm_is_dup(struct ieee80211_sta *sta, int queue, return false; mvm_sta = iwl_mvm_sta_from_mac80211(sta); + + if (WARN_ON_ONCE(!mvm_sta->dup_data)) + return false; + dup_data = &mvm_sta->dup_data[queue]; /* |