This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / core / pktgen.c

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index f57db05..1d1c545 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -69,12 +69,13 @@
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/inet.h>
 #include <linux/rcupdate.h>
-#include <linux/bitops.h>
 #include <asm/byteorder.h>
+#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>
@@ -602,10 +603,8 @@ static void show_results(struct pktgen_info* info, int nr_frags)
        do_div(idle, cpu_speed);
 
        p += sprintf(p, "OK: %llu(c%llu+d%lu) usec, %llu (%dbyte,%dfrags)\n",
-                    (unsigned long long) total,
-                    (unsigned long long) (total - idle), idle,
-                    (unsigned long long) info->sofar,
-                    size, nr_frags);
+                    total, total - idle, idle,
+                    info->sofar, size, nr_frags);
 
        pps = info->sofar * USEC_PER_SEC;
        
@@ -621,10 +620,7 @@ static void show_results(struct pktgen_info* info, int nr_frags)
        mbps = bps;
        do_div(mbps, 1000000);
        p += sprintf(p, "  %llupps %lluMb/sec (%llubps) errors: %llu",
-                    (unsigned long long) pps,
-                    (unsigned long long) mbps,
-                    (unsigned long long) bps,
-                    (unsigned long long) info->errors);
+                    pps, mbps, bps, info->errors);
 }
 
 static void inject(struct pktgen_info* info)
@@ -647,7 +643,6 @@ static void inject(struct pktgen_info* info)
        info->do_run_run = 1; /* Cranke yeself! */
        info->idle_acc = 0;
        info->sofar = 0;
-       info->errors = 0;
        lcount = info->count;