diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-29 21:07:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-01 17:39:55 -0700 |
| commit | 10b3ad8c21bb4b135768c30dd4c51a1c744da699 (patch) | |
| tree | 02acb0d328818c9216c93b6b46d62717e09cdc61 /net/core/netpoll.c | |
| parent | dace1b54726bffe1c009f7661e3cee6b762f30c8 (diff) | |
| download | linux-stable-10b3ad8c21bb4b135768c30dd4c51a1c744da699.tar.gz linux-stable-10b3ad8c21bb4b135768c30dd4c51a1c744da699.tar.bz2 linux-stable-10b3ad8c21bb4b135768c30dd4c51a1c744da699.zip | |
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.c | 4 |
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, skb->vlan_tci = 0; } - status = netdev_start_xmit(skb, dev); - if (status == NETDEV_TX_OK) - txq_trans_update(txq); + status = netdev_start_xmit(skb, dev, txq); out: return status; |