diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2017-12-19 10:11:54 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-12-19 10:12:48 +0100 |
| commit | e7881bd5942df7df2fc450fd2aaa753fc4c4e125 (patch) | |
| tree | 936a15e2817360d322ebe90373099da0d3f478a9 /net/mac80211/ieee80211_i.h | |
| parent | Revert "mac80211: Add airtime account and scheduling to TXQs" (diff) | |
| download | linux-dev-e7881bd5942df7df2fc450fd2aaa753fc4c4e125.tar.xz linux-dev-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 '')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 4155838c7bef..26900025de2f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -832,7 +832,6 @@ struct txq_info { struct codel_vars def_cvars; struct codel_stats cstats; struct sk_buff_head frags; - struct list_head schedule_order; unsigned long flags; /* keep last! */ @@ -1123,10 +1122,6 @@ struct ieee80211_local { struct codel_vars *cvars; struct codel_params cparams; - /* protects active_txqs and txqi->schedule_order */ - spinlock_t active_txq_lock; - struct list_head active_txqs; - const struct ieee80211_ops *ops; /* |