aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-12-19 10:11:54 +0100
committerJohannes Berg <johannes.berg@intel.com>2017-12-19 10:12:48 +0100
commite7881bd5942df7df2fc450fd2aaa753fc4c4e125 (patch)
tree936a15e2817360d322ebe90373099da0d3f478a9 /net/mac80211/main.c
parentRevert "mac80211: Add airtime account and scheduling to TXQs" (diff)
downloadwireguard-linux-e7881bd5942df7df2fc450fd2aaa753fc4c4e125.tar.xz
wireguard-linux-e7881bd5942df7df2fc450fd2aaa753fc4c4e125.zip
Revert "mac80211: Add TXQ scheduling API"
This reverts commit e937b8da5a591f141fe41aa48a2e898df9888c95. Turns out that a new driver (mt76) is coming in through Kalle's tree, and will conflict with this. It also has some conflicting requirements, so we'll revisit this later. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 935d6e2491b1..0785d04a80bc 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -619,9 +619,6 @@ 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);
- spin_lock_init(&local->active_txq_lock);
-
INIT_LIST_HEAD(&local->chanctx_list);
mutex_init(&local->chanctx_mtx);