SOURCES (LINUX_2_6): linux-2.6-nf-ip_queue_vwmark.patch - snap 200...

[cieciwa]

Author: cieciwa                      Date: Sat Oct 29 23:49:56 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.

---- Files affected:
SOURCES:
   linux-2.6-nf-ip_queue_vwmark.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-ip_queue_vwmark.patch
diff -u SOURCES/linux-2.6-nf-ip_queue_vwmark.patch:1.1.2.1 SOURCES/linux-2.6-nf-ip_queue_vwmark.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-ip_queue_vwmark.patch:1.1.2.1	Thu Sep 15 10:11:41 2005
+++ SOURCES/linux-2.6-nf-ip_queue_vwmark.patch	Sun Oct 30 01:49:51 2005
@@ -2,9 +2,9 @@
  net/ipv4/netfilter/ip_queue.c           |   35 ++++++++++++++++++++++++++++++++
  2 files changed, 47 insertions(+), 1 deletion(-)
 
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/include/linux/netfilter_ipv4/ip_queue.h linux-2.6.13.1/include/linux/netfilter_ipv4/ip_queue.h
---- linux-2.6.13.1.org/include/linux/netfilter_ipv4/ip_queue.h	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ip_queue.h	2005-09-15 10:01:34.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ip_queue.h linux-2.6.14/include/linux/netfilter_ipv4/ip_queue.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ip_queue.h	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/include/linux/netfilter_ipv4/ip_queue.h	2005-10-30 01:33:45.000000000 +0200
 @@ -47,10 +47,20 @@
  	unsigned char payload[0];	/* Optional replacement packet */
  } ipq_verdict_msg_t;
@@ -35,10 +35,10 @@
 +#define IPQM_MAX	(IPQM_BASE + 5)
  
  #endif /*_IP_QUEUE_H*/
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/ip_queue.c linux-2.6.13.1/net/ipv4/netfilter/ip_queue.c
---- linux-2.6.13.1.org/net/ipv4/netfilter/ip_queue.c	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/ip_queue.c	2005-09-15 10:01:34.000000000 +0200
-@@ -450,6 +450,33 @@
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ip_queue.c linux-2.6.14/net/ipv4/netfilter/ip_queue.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ip_queue.c	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/ip_queue.c	2005-10-30 01:33:45.000000000 +0200
+@@ -423,6 +423,33 @@
  }
  
  static int
@@ -72,7 +72,7 @@
  ipq_receive_peer(struct ipq_peer_msg *pmsg,
                   unsigned char type, unsigned int len)
  {
-@@ -471,6 +498,14 @@
+@@ -444,6 +471,14 @@
  			status = ipq_set_verdict(&pmsg->msg.verdict,
  			                         len - sizeof(*pmsg));
  			break;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-ip_queue_vwmark.patch?r1=1.1.2.1&r2=1.1.2.2&f=u