SOURCES (LINUX_2_6): linux-PF_RING.patch, kernel-layer7.patch, ker...

[arekm]

Author: arekm                        Date: Sat Jan 19 23:04:46 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- update

---- Files affected:
SOURCES:
   linux-PF_RING.patch (1.1.2.2 -> 1.1.2.3) , kernel-layer7.patch (1.1.2.5 -> 1.1.2.6) , kernel-ipt_account.patch (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/linux-PF_RING.patch
diff -u SOURCES/linux-PF_RING.patch:1.1.2.2 SOURCES/linux-PF_RING.patch:1.1.2.3
--- SOURCES/linux-PF_RING.patch:1.1.2.2	Mon Aug 13 14:53:09 2007
+++ SOURCES/linux-PF_RING.patch	Sun Jan 20 00:04:39 2008
@@ -6371,7 +6371,7 @@
 +/* ********************************** */
 +
 +static void ring_proc_init(void) {
-+  ring_proc_dir = proc_mkdir("pf_ring", proc_net);
++  ring_proc_dir = proc_mkdir("pf_ring", init_net.proc_net);
 +
 +  if(ring_proc_dir) {
 +    ring_proc_dir->owner = THIS_MODULE;
@@ -6392,7 +6392,7 @@
 +static void ring_proc_term(void) {
 +  if(ring_proc != NULL) {
 +    remove_proc_entry("info", ring_proc_dir);
-+    if(ring_proc_dir != NULL) remove_proc_entry("pf_ring", proc_net);
++    if(ring_proc_dir != NULL) remove_proc_entry("pf_ring", init_net.proc_net);
 +
 +    printk("PF_RING: deregistered /proc/net/pf_ring\n");
 +  }

================================================================
Index: SOURCES/kernel-layer7.patch
diff -u SOURCES/kernel-layer7.patch:1.1.2.5 SOURCES/kernel-layer7.patch:1.1.2.6
--- SOURCES/kernel-layer7.patch:1.1.2.5	Thu Aug 23 21:22:13 2007
+++ SOURCES/kernel-layer7.patch	Sun Jan 20 00:04:40 2008
@@ -618,14 +618,14 @@
 +
 +static void layer7_cleanup_proc(void)
 +{
-+	remove_proc_entry("layer7_numpackets", proc_net);
++	remove_proc_entry("layer7_numpackets", init_net.proc_net);
 +}
 +
 +/* register the proc file */
 +static void layer7_init_proc(void)
 +{
 +	struct proc_dir_entry* entry;
-+	entry = create_proc_entry("layer7_numpackets", 0644, proc_net);
++	entry = create_proc_entry("layer7_numpackets", 0644, init_net.proc_net);
 +	entry->read_proc = layer7_read_proc;
 +	entry->write_proc = layer7_write_proc;
 +}

================================================================
Index: SOURCES/kernel-ipt_account.patch
diff -u SOURCES/kernel-ipt_account.patch:1.1.2.5 SOURCES/kernel-ipt_account.patch:1.1.2.6
--- SOURCES/kernel-ipt_account.patch:1.1.2.5	Wed Nov 28 01:51:21 2007
+++ SOURCES/kernel-ipt_account.patch	Sun Jan 20 00:04:41 2008
@@ -938,9 +938,9 @@
 +  }
 +
 +  /* Create /proc/net/ipt_account/ entry. */
-+  ipt_account_procdir = proc_mkdir("ipt_account", proc_net);
++  ipt_account_procdir = proc_mkdir("ipt_account", init_net.proc_net);
 +  if (!ipt_account_procdir) {   
-+    printk(KERN_ERR "ipt_account [__init]: ipt_account_procdir = proc_mkdir(\"ipt_account\", proc_net) failed.\n");
++    printk(KERN_ERR "ipt_account [__init]: ipt_account_procdir = proc_mkdir(\"ipt_account\", init_net.proc_net) failed.\n");
 +    ret = -ENOMEM;
 +    goto cleanup_match;
 +  }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-PF_RING.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-layer7.patch?r1=1.1.2.5&r2=1.1.2.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ipt_account.patch?r1=1.1.2.5&r2=1.1.2.6&f=u