pktgen: use common idle routine

Simpler to have one place that spins and accounts for delays,
this will also make the last packet be detected faster for more
repeatable timing.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 3045dd133071f84033f0ba1528ee95aafd3c01fd..ad41f06c13ca853bab08d901052809df3f05a3f9 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3458,16 +3458,10 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
 
        /* If pkt_dev->count is zero, then run forever */
        if ((pkt_dev->count != 0) && (pkt_dev->sofar >= pkt_dev->count)) {
-               if (atomic_read(&(pkt_dev->skb->users)) != 1) {
-                       ktime_t idle_start = ktime_now();
-                       while (atomic_read(&(pkt_dev->skb->users)) != 1) {
-                               if (signal_pending(current)) {
-                                       break;
-                               }
-                               schedule();
-                       }
-                       pkt_dev->idle_acc += ktime_to_ns(ktime_sub(ktime_now(),
-                                                                  idle_start));
+               while (atomic_read(&(pkt_dev->skb->users)) != 1) {
+                       if (signal_pending(current))
+                               break;
+                       idle(pkt_dev);
                }
 
                /* Done with this */