diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2017-12-19 10:10:48 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-12-19 10:12:26 +0100 |
| commit | 0973dd45ecefd746569d414406f5733062fe2817 (patch) | |
| tree | 7a7d3eb5261a47160fef831203a0c90fca6bee8d /net/mac80211/main.c | |
| parent | mac80211: Add airtime account and scheduling to TXQs (diff) | |
| download | wireguard-linux-0973dd45ecefd746569d414406f5733062fe2817.tar.xz wireguard-linux-0973dd45ecefd746569d414406f5733062fe2817.zip | |
Revert "mac80211: Add airtime account and scheduling to TXQs"
This reverts commit b0d52ad821843a6c5badebd80feef9f871904fa6.
We need to revert the TXQ scheduling API due to conflicts
with a new driver, and this depends on that API.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index b7142f8491d0..935d6e2491b1 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -619,8 +619,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, spin_lock_init(&local->rx_path_lock); spin_lock_init(&local->queue_stop_reason_lock); - INIT_LIST_HEAD(&local->active_txqs_new); - INIT_LIST_HEAD(&local->active_txqs_old); + INIT_LIST_HEAD(&local->active_txqs); spin_lock_init(&local->active_txq_lock); INIT_LIST_HEAD(&local->chanctx_list); |