From: Johannes Berg Date: Wed, 22 Apr 2015 14:44:46 +0000 (+0200) Subject: mac80211: don't update dev->trans_start X-Git-Tag: v4.9.8~4072^2~97^2~52 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce5b071a456beea13a893fcc73f47998bf7ceb35;p=platform%2Fkernel%2Flinux-rpi3.git 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 --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index df62942..83e3261 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); }