SOURCES (LINUX_2_6): linux-2.6-nf-IPMARK.patch - snap 20051028 for...

[cieciwa]

Author: cieciwa                      Date: Sat Oct 29 20:14:24 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- snap 20051028 for 2.6.14.

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

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-IPMARK.patch
diff -u SOURCES/linux-2.6-nf-IPMARK.patch:1.1.2.1 SOURCES/linux-2.6-nf-IPMARK.patch:1.1.2.2
--- SOURCES/linux-2.6-nf-IPMARK.patch:1.1.2.1	Thu Sep 15 11:22:46 2005
+++ SOURCES/linux-2.6-nf-IPMARK.patch	Sat Oct 29 22:14:19 2005
@@ -4,9 +4,9 @@
  net/ipv4/netfilter/ipt_IPMARK.c           |   81 ++++++++++++++++++++++++++++++
  4 files changed, 107 insertions(+)
 
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_IPMARK.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_IPMARK.h
---- linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_IPMARK.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_IPMARK.h	2005-09-15 11:14:29.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_IPMARK.h linux-2.6.14/include/linux/netfilter_ipv4/ipt_IPMARK.h
+--- linux-2.6.14.org/include/linux/netfilter_ipv4/ipt_IPMARK.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/include/linux/netfilter_ipv4/ipt_IPMARK.h	2005-10-29 21:56:01.000000000 +0200
 @@ -0,0 +1,13 @@
 +#ifndef _IPT_IPMARK_H_target
 +#define _IPT_IPMARK_H_target
@@ -21,10 +21,10 @@
 +#define IPT_IPMARK_DST    1
 +
 +#endif /*_IPT_IPMARK_H_target*/
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig linux-2.6.13.1/net/ipv4/netfilter/Kconfig
---- linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig	2005-09-15 11:14:29.000000000 +0200
-@@ -692,5 +692,17 @@
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Kconfig linux-2.6.14/net/ipv4/netfilter/Kconfig
+--- linux-2.6.14.org/net/ipv4/netfilter/Kconfig	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Kconfig	2005-10-29 21:56:01.000000000 +0200
+@@ -821,5 +821,17 @@
  	  Allows altering the ARP packet payload: source and destination
  	  hardware and network addresses.
  
@@ -42,14 +42,14 @@
 +
  endmenu
  
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Makefile linux-2.6.13.1/net/ipv4/netfilter/Makefile
---- linux-2.6.13.1.org/net/ipv4/netfilter/Makefile	2005-09-10 04:42:58.000000000 +0200
-+++ linux-2.6.13.1/net/ipv4/netfilter/Makefile	2005-09-15 11:14:29.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/Makefile linux-2.6.14/net/ipv4/netfilter/Makefile
+--- linux-2.6.14.org/net/ipv4/netfilter/Makefile	2005-10-28 02:02:08.000000000 +0200
++++ linux-2.6.14/net/ipv4/netfilter/Makefile	2005-10-29 21:56:01.000000000 +0200
 @@ -0,0 +0,1 @@
 +obj-$(CONFIG_IP_NF_TARGET_IPMARK) += ipt_IPMARK.o
-diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/ipt_IPMARK.c linux-2.6.13.1/net/ipv4/netfilter/ipt_IPMARK.c
---- linux-2.6.13.1.org/net/ipv4/netfilter/ipt_IPMARK.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.13.1/net/ipv4/netfilter/ipt_IPMARK.c	2005-09-15 11:14:29.000000000 +0200
+diff -Nur --exclude '*.orig' linux-2.6.14.org/net/ipv4/netfilter/ipt_IPMARK.c linux-2.6.14/net/ipv4/netfilter/ipt_IPMARK.c
+--- linux-2.6.14.org/net/ipv4/netfilter/ipt_IPMARK.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.14/net/ipv4/netfilter/ipt_IPMARK.c	2005-10-29 21:56:01.000000000 +0200
 @@ -0,0 +1,81 @@
 +/* This is a module which is used for setting the NFMARK field of an skb. */
 +#include <linux/module.h>
================================================================

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