diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-03-31 10:51:45 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-03-31 11:07:40 +0200 |
| commit | 0b354b8b09be37f672ca0f91855f86331d08f1a4 (patch) | |
| tree | eeeab4f3ce62c00828c499b366696aa9889547fe /net/mac80211/ieee80211_i.h | |
| parent | aa2aa818cd1198cfa2498116d57cd9f13fea80e4 (diff) | |
| parent | 12b220a6171faf10638ab683a975cadcf1a352d6 (diff) | |
Merge wireless/main into wireless-next/main
There are a few merge conflicts due to overlapping
fixes and changes, merge wireless/main to fix them.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index cdc80285efd4..8c058351e629 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1322,6 +1322,9 @@ struct ieee80211_local { struct list_head active_txqs[IEEE80211_NUM_ACS]; u16 schedule_round[IEEE80211_NUM_ACS]; + /* serializes ieee80211_handle_wake_tx_queue */ + spinlock_t handle_wake_tx_queue_lock; + u16 airtime_flags; u32 aql_txq_limit_low[IEEE80211_NUM_ACS]; u32 aql_txq_limit_high[IEEE80211_NUM_ACS]; |