diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 19:43:52 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 19:49:36 +0200 |
| commit | 10f5ae21940cc754f82828d81b8009f2e8ae2c64 (patch) | |
| tree | 8156f045504a2f9e1d767b0af6f89b19a4de2e52 /net/mac80211/tx.c | |
| parent | Revert "wifi: iwlwifi: update response for mcc_update command" (diff) | |
| parent | wifi: cfg80211: fix locking in regulatory disconnect (diff) | |
| download | linux-10f5ae21940cc754f82828d81b8009f2e8ae2c64.tar.xz linux-10f5ae21940cc754f82828d81b8009f2e8ae2c64.zip | |
Merge wireless into wireless-next
There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e809c4236f78..148a0e2aa740 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3775,6 +3775,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, ieee80211_tx_result r; struct ieee80211_vif *vif = txq->vif; int q = vif->hw_queue[txq->ac]; + unsigned long flags; bool q_stopped; WARN_ON_ONCE(softirq_count() == 0); @@ -3783,9 +3784,9 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, return NULL; begin: - spin_lock(&local->queue_stop_reason_lock); + spin_lock_irqsave(&local->queue_stop_reason_lock, flags); q_stopped = local->queue_stop_reasons[q]; - spin_unlock(&local->queue_stop_reason_lock); + spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); if (unlikely(q_stopped)) { /* mark for waking later */ @@ -5511,7 +5512,7 @@ ieee80211_beacon_get_template_ema_list(struct ieee80211_hw *hw, { struct ieee80211_ema_beacons *ema_beacons = NULL; - WARN_ON(__ieee80211_beacon_get(hw, vif, NULL, false, link_id, 0, + WARN_ON(__ieee80211_beacon_get(hw, vif, NULL, true, link_id, 0, &ema_beacons)); return ema_beacons; |