summaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-02-25 10:03:25 +0100
committerJohannes Berg <johannes.berg@intel.com>2015-02-28 21:31:11 +0100
commitabfbc3af57b1b92ff976ce7f1c776c169d14ed8a (patch)
tree43e22cfdcdda1c832350f031460418972f226866 /net/mac80211/main.c
parent31f909a2c0abfc1a1a76b2981d28ac85d33210e7 (diff)
downloadlinux-abfbc3af57b1b92ff976ce7f1c776c169d14ed8a.tar.bz2
mac80211: remove TX latency measurement code
Revert commit ad38bfc916da ("mac80211: Tx frame latency statistics") (along with some follow-up fixes). This code turned out not to be as useful in the current form as we thought, and we've internally hacked it up more, but that's not very suitable for upstream (for now), and we might just do that with tracing instead. Therefore, for now at least, remove this code. We might also need to use the skb->tstamp field for the TCP performance issue, which is more important than the debugging. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 5e09d354c5a5..2f51e6d1f2b3 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1201,8 +1201,6 @@ void ieee80211_free_hw(struct ieee80211_hw *hw)
ieee80211_free_ack_frame, NULL);
idr_destroy(&local->ack_status_frames);
- kfree(rcu_access_pointer(local->tx_latency));
-
sta_info_stop(local);
wiphy_free(local->hw.wiphy);