summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-04-22 16:44:46 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-04-24 11:15:26 +0200
commitce5b071a456beea13a893fcc73f47998bf7ceb35 (patch)
tree7478b320bb71f3f04774390750e9a57e868aa2f9 /net/mac80211
parent6fe3eac79329611eaa716b7a3e3b85f6698b668b (diff)
downloadlinux-ce5b071a456beea13a893fcc73f47998bf7ceb35.tar.gz
mac80211: don't update dev->trans_start
This isn't necessary any more as the stack will automatically update the TXQ's trans_start after calling ndo_start_xmit(). Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/tx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index df62942653ad..83e3261dbf67 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2729,7 +2729,6 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len + extra_head;
- dev->trans_start = jiffies;
/* will not be crypto-handled beyond what we do here, so use false
* as the may-encrypt argument for the resize to not account for
@@ -2912,7 +2911,6 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
- dev->trans_start = jiffies;
ieee80211_xmit(sdata, sta, skb);
}