summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-12-19 04:10:48 -0500
committerJohannes Berg <johannes.berg@intel.com>2017-12-19 04:12:26 -0500
commit0973dd45ecefd746569d414406f5733062fe2817 (patch)
tree7a7d3eb5261a47160fef831203a0c90fca6bee8d /net/mac80211/rx.c
parentb0d52ad821843a6c5badebd80feef9f871904fa6 (diff)
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.c8
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)
1630 if (ieee80211_vif_is_mesh(&rx->sdata->vif)) 1630 if (ieee80211_vif_is_mesh(&rx->sdata->vif))
1631 ieee80211_mps_rx_h_sta_process(sta, hdr); 1631 ieee80211_mps_rx_h_sta_process(sta, hdr);
1632 1632
1633 /* airtime accounting */
1634 if (status->airtime) {
1635 spin_lock_bh(&sta->lock);
1636 sta->airtime_stats.rx_airtime += status->airtime;
1637 sta->airtime_deficit -= status->airtime;
1638 spin_unlock_bh(&sta->lock);
1639 }
1640
1641 /* 1633 /*
1642 * Drop (qos-)data::nullfunc frames silently, since they 1634 * Drop (qos-)data::nullfunc frames silently, since they
1643 * are used only to control station power saving mode. 1635 * are used only to control station power saving mode.