aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/pktgen.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/pktgen.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/pktgen.c')
-rw-r--r--net/core/pktgen.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index d81b540096c3..34bd2ff9f121 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3335,11 +3335,10 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
3335 goto unlock; 3335 goto unlock;
3336 } 3336 }
3337 atomic_inc(&(pkt_dev->skb->users)); 3337 atomic_inc(&(pkt_dev->skb->users));
3338 ret = netdev_start_xmit(pkt_dev->skb, odev); 3338 ret = netdev_start_xmit(pkt_dev->skb, odev, txq);
3339 3339
3340 switch (ret) { 3340 switch (ret) {
3341 case NETDEV_TX_OK: 3341 case NETDEV_TX_OK:
3342 txq_trans_update(txq);
3343 pkt_dev->last_ok = 1; 3342 pkt_dev->last_ok = 1;
3344 pkt_dev->sofar++; 3343 pkt_dev->sofar++;
3345 pkt_dev->seq_num++; 3344 pkt_dev->seq_num++;