summaryrefslogtreecommitdiffstats
path: root/net/mac80211/agg-tx.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/agg-tx.c
parent0973dd45ecefd746569d414406f5733062fe2817 (diff)
downloadlinux-e7881bd5942df7df2fc450fd2aaa753fc4c4e125.tar.bz2
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/agg-tx.c')
-rw-r--r--net/mac80211/agg-tx.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 6c6cad98ce92..595c662a61e8 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -226,13 +226,9 @@ ieee80211_agg_start_txq(struct sta_info *sta, int tid, bool enable)
clear_bit(IEEE80211_TXQ_AMPDU, &txqi->flags);
clear_bit(IEEE80211_TXQ_STOP, &txqi->flags);
-
- if (!ieee80211_schedule_txq(&sta->sdata->local->hw, txq))
- return;
-
local_bh_disable();
rcu_read_lock();
- drv_wake_tx_queue(sta->sdata->local);
+ drv_wake_tx_queue(sta->sdata->local, txqi);
rcu_read_unlock();
local_bh_enable();
}