aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/netpoll.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-08-30 00:07:24 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-01 20:39:55 -0400
commit10b3ad8c21bb4b135768c30dd4c51a1c744da699 (patch)
tree02acb0d328818c9216c93b6b46d62717e09cdc61 /net/core/netpoll.c
parentdace1b54726bffe1c009f7661e3cee6b762f30c8 (diff)
net: Do txq_trans_update() in netdev_start_xmit()
That way we don't have to audit every call site to make sure it is doing this properly. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/netpoll.c')
-rw-r--r--net/core/netpoll.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 12b1df976562..05bc57edaa81 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -91,9 +91,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
91 skb->vlan_tci = 0; 91 skb->vlan_tci = 0;
92 } 92 }
93 93
94 status = netdev_start_xmit(skb, dev); 94 status = netdev_start_xmit(skb, dev, txq);
95 if (status == NETDEV_TX_OK)
96 txq_trans_update(txq);
97 95
98out: 96out:
99 return status; 97 return status;