VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 3821caa..d1a62cd 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -56,6 +56,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
@@ -1355,7 +1356,7 @@ static int __init init(void)
                pginfos[i].udp_dst_max = 9;
                
                sprintf(pginfos[i].fname, "net/%s/pg%i", PG_PROC_DIR, i);
-               pginfos[i].proc_ent = create_proc_entry(pginfos[i].fname, 0600, 0);
+               pginfos[i].proc_ent = create_proc_entry(pginfos[i].fname, 0600, NULL);
                if (!pginfos[i].proc_ent) {
                        printk("pktgen: Error: cannot create net/%s/pg procfs entry.\n", PG_PROC_DIR);
                        goto cleanup_mem;
@@ -1366,7 +1367,7 @@ static int __init init(void)
                pginfos[i].proc_ent->owner = THIS_MODULE;
 
                sprintf(pginfos[i].busy_fname, "net/%s/pg_busy%i",  PG_PROC_DIR, i);
-               pginfos[i].busy_proc_ent = create_proc_entry(pginfos[i].busy_fname, 0, 0);
+               pginfos[i].busy_proc_ent = create_proc_entry(pginfos[i].busy_fname, 0, NULL);
                if (!pginfos[i].busy_proc_ent) {
                        printk("pktgen: Error: cannot create net/%s/pg_busy procfs entry.\n", PG_PROC_DIR);
                        goto cleanup_mem;
@@ -1409,7 +1410,7 @@ module_exit(cleanup);
 MODULE_AUTHOR("Robert Olsson <robert.olsson@its.uu.se");
 MODULE_DESCRIPTION("Packet Generator tool");
 MODULE_LICENSE("GPL");
-MODULE_PARM(count_d, "i");
-MODULE_PARM(ipg_d, "i");
-MODULE_PARM(cpu_speed, "i");
-MODULE_PARM(clone_skb_d, "i");
+module_param(count_d, int, 0);
+module_param(ipg_d, int, 0);
+module_param(cpu_speed, int, 0);
+module_param(clone_skb_d, int, 0);