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/rx.c | |
| parent | b0d52ad821843a6c5badebd80feef9f871904fa6 (diff) | |
| download | linux-0973dd45ecefd746569d414406f5733062fe2817.tar.gz linux-0973dd45ecefd746569d414406f5733062fe2817.tar.bz2 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/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 808f41fb536a..b3cff69bfd66 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1630,14 +1630,6 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) if (ieee80211_vif_is_mesh(&rx->sdata->vif)) ieee80211_mps_rx_h_sta_process(sta, hdr); - /* airtime accounting */ - if (status->airtime) { - spin_lock_bh(&sta->lock); - sta->airtime_stats.rx_airtime += status->airtime; - sta->airtime_deficit -= status->airtime; - spin_unlock_bh(&sta->lock); - } - /* * Drop (qos-)data::nullfunc frames silently, since they * are used only to control station power saving mode. |