SOURCES: linux-2.4.26-netfilter-pom-ng-20040302.patch - updated fo...

[qboosh]

Author: qboosh                       Date: Thu Nov 17 09:53:34 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.4.32

---- Files affected:
SOURCES:
   linux-2.4.26-netfilter-pom-ng-20040302.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch
diff -u SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch:1.8 SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch:1.9
--- SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch:1.8	Tue Apr  5 14:15:14 2005
+++ SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch	Thu Nov 17 10:53:29 2005
@@ -23062,9 +23062,8 @@
 +
 +module_init(init);
 +module_exit(fini);
-diff -urN linux-2.4.26.org/net/ipv6/netfilter/ip6t_LOG.c linux-2.4.26/net/ipv6/netfilter/ip6t_LOG.c
---- linux-2.4.26.org/net/ipv6/netfilter/ip6t_LOG.c	2004-04-26 02:59:29.606323696 +0200
-+++ linux-2.4.26/net/ipv6/netfilter/ip6t_LOG.c	2004-04-26 03:16:20.540638320 +0200
+--- linux-2.4.32/net/ipv6/netfilter/ip6t_LOG.c.orig	2005-11-16 20:12:54.000000000 +0100
++++ linux-2.4.32/net/ipv6/netfilter/ip6t_LOG.c	2005-11-17 10:34:59.000000000 +0100
 @@ -10,6 +10,7 @@
  #include <net/tcp.h>
  #include <net/ipv6.h>
@@ -23073,7 +23072,7 @@
  
  MODULE_AUTHOR("Jan Rekorajski <baggins at pld.org.pl>");
  MODULE_DESCRIPTION("IP6 tables LOG target module");
-@@ -266,23 +267,21 @@
+@@ -355,22 +356,19 @@
  	}
  }
  
@@ -23090,10 +23089,9 @@
 +		const char *level_string,
 +		const char *prefix)
  {
- 	struct ipv6hdr *ipv6h = (*pskb)->nh.ipv6h;
 -	const struct ip6t_log_info *loginfo = targinfo;
 -	char level_string[4] = "< >";
- 
+-
 -	level_string[1] = '0' + (loginfo->level % 8);
  	spin_lock_bh(&log_lock);
  	printk(level_string);
@@ -23103,8 +23101,8 @@
  		in ? in->name : "",
  		out ? out->name : "");
  	if (in && !out) {
-@@ -329,10 +328,59 @@
- 	dump_packet(loginfo, ipv6h, 1);
+@@ -409,10 +407,59 @@
+ 		    1);
  	printk("\n");
  	spin_unlock_bh(&log_lock);
 +}
@@ -23163,7 +23161,7 @@
  static int ip6t_log_checkentry(const char *tablename,
  			       const struct ip6t_entry *e,
  			       void *targinfo,
-@@ -364,17 +412,21 @@
+@@ -444,17 +491,21 @@
  static struct ip6t_target ip6t_log_reg
  = { { NULL, NULL }, "LOG", ip6t_log_target, ip6t_log_checkentry, NULL, 
      THIS_MODULE };
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.4.26-netfilter-pom-ng-20040302.patch?r1=1.8&r2=1.9&f=u