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/packet | |
| parent | dace1b54726bffe1c009f7661e3cee6b762f30c8 (diff) | |
| download | op-kernel-dev-10b3ad8c21bb4b135768c30dd4c51a1c744da699.zip op-kernel-dev-10b3ad8c21bb4b135768c30dd4c51a1c744da699.tar.gz | |
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/packet')
| -rw-r--r-- | net/packet/af_packet.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index b7a7f5a..fe305a0 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -258,11 +258,8 @@ static int packet_direct_xmit(struct sk_buff *skb) local_bh_disable(); HARD_TX_LOCK(dev, txq, smp_processor_id()); - if (!netif_xmit_frozen_or_drv_stopped(txq)) { - ret = netdev_start_xmit(skb, dev); - if (ret == NETDEV_TX_OK) - txq_trans_update(txq); - } + if (!netif_xmit_frozen_or_drv_stopped(txq)) + ret = netdev_start_xmit(skb, dev, txq); HARD_TX_UNLOCK(dev, txq); local_bh_enable(); |
