aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/pktgen.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r--net/core/pktgen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 4e77914c4d42..15e0c2c7aacf 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3352,14 +3352,14 @@ static void pktgen_rem_thread(struct pktgen_thread *t)
3352 3352
3353static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev) 3353static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
3354{ 3354{
3355 struct net_device *odev = NULL; 3355 struct net_device *odev = pkt_dev->odev;
3356 int (*xmit)(struct sk_buff *, struct net_device *)
3357 = odev->netdev_ops->ndo_start_xmit;
3356 struct netdev_queue *txq; 3358 struct netdev_queue *txq;
3357 __u64 idle_start = 0; 3359 __u64 idle_start = 0;
3358 u16 queue_map; 3360 u16 queue_map;
3359 int ret; 3361 int ret;
3360 3362
3361 odev = pkt_dev->odev;
3362
3363 if (pkt_dev->delay_us || pkt_dev->delay_ns) { 3363 if (pkt_dev->delay_us || pkt_dev->delay_ns) {
3364 u64 now; 3364 u64 now;
3365 3365
@@ -3440,7 +3440,7 @@ static __inline__ void pktgen_xmit(struct pktgen_dev *pkt_dev)
3440 3440
3441 atomic_inc(&(pkt_dev->skb->users)); 3441 atomic_inc(&(pkt_dev->skb->users));
3442 retry_now: 3442 retry_now:
3443 ret = odev->hard_start_xmit(pkt_dev->skb, odev); 3443 ret = (*xmit)(pkt_dev->skb, odev);
3444 if (likely(ret == NETDEV_TX_OK)) { 3444 if (likely(ret == NETDEV_TX_OK)) {
3445 pkt_dev->last_ok = 1; 3445 pkt_dev->last_ok = 1;
3446 pkt_dev->sofar++; 3446 pkt_dev->sofar++;