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/main.c | |
| 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/main.c')
| -rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 846528850612..ddf2b7811c55 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -802,6 +802,8 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, local->aql_threshold = IEEE80211_AQL_THRESHOLD; atomic_set(&local->aql_total_pending_airtime, 0); + spin_lock_init(&local->handle_wake_tx_queue_lock); + INIT_LIST_HEAD(&local->chanctx_list); mutex_init(&local->chanctx_mtx); |