SOURCES (LINUX_2_6): 2.6.10-imq.patch - fix

areq areq at pld-linux.org
Sun Sep 11 17:26:32 CEST 2005


Author: areq                         Date: Sun Sep 11 15:26:31 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fix

---- Files affected:
SOURCES:
   2.6.10-imq.patch (1.1.2.9 -> 1.1.2.10) 

---- Diffs:

================================================================
Index: SOURCES/2.6.10-imq.patch
diff -u SOURCES/2.6.10-imq.patch:1.1.2.9 SOURCES/2.6.10-imq.patch:1.1.2.10
--- SOURCES/2.6.10-imq.patch:1.1.2.9	Sat Sep 10 14:30:06 2005
+++ SOURCES/2.6.10-imq.patch	Sun Sep 11 17:26:26 2005
@@ -583,8 +583,8 @@
 +	struct nf_info          *nf_info;
 +#endif
 +
- #ifdef CONFIG_BRIDGE_NETFILTER
- 	struct nf_bridge_info	*nf_bridge;
+ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+ 	struct sk_buff		*nfct_reasm;
  #endif
 diff -Nru linux-2.6.13/net/ipv4/netfilter/Kconfig linux-2.6.13-imq/net/ipv4/netfilter/Kconfig
 --- linux-2.6.13/net/ipv4/netfilter/Kconfig	2005-08-28 23:41:01.000000000 +0000
@@ -610,14 +610,14 @@
 diff -Nru linux-2.6.13/net/ipv4/netfilter/Makefile linux-2.6.13-imq/net/ipv4/netfilter/Makefile
 --- linux-2.6.13/net/ipv4/netfilter/Makefile	2005-08-28 23:41:01.000000000 +0000
 +++ linux-2.6.13-imq/net/ipv4/netfilter/Makefile	2005-08-29 21:02:39.000000000 +0000
-@@ -66,6 +66,7 @@
+@@ -113,6 +113,7 @@
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
  obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o
  obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
 +obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
+ obj-$(CONFIG_IP_NF_TARGET_IPMARK) += ipt_IPMARK.o
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
- obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
 diff -Nru linux-2.6.13/net/ipv4/netfilter/ipt_IMQ.c linux-2.6.13-imq/net/ipv4/netfilter/ipt_IMQ.c
 --- linux-2.6.13/net/ipv4/netfilter/ipt_IMQ.c	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.13-imq/net/ipv4/netfilter/ipt_IMQ.c	2005-08-29 21:02:39.000000000 +0000
@@ -722,14 +722,14 @@
 diff -Nru linux-2.6.13/net/ipv6/netfilter/Makefile linux-2.6.13-imq/net/ipv6/netfilter/Makefile
 --- linux-2.6.13/net/ipv6/netfilter/Makefile	2005-08-28 23:41:01.000000000 +0000
 +++ linux-2.6.13-imq/net/ipv6/netfilter/Makefile	2005-08-29 21:02:39.000000000 +0000
-@@ -20,6 +20,7 @@
+@@ -22,6 +22,7 @@
  obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
  obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
  obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t_MARK.o
 +obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
+ obj-$(CONFIG_IP6_NF_TARGET_ROUTE) += ip6t_ROUTE.o
  obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
  obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
- obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
 diff -Nru linux-2.6.13/net/ipv6/netfilter/ip6t_IMQ.c linux-2.6.13-imq/net/ipv6/netfilter/ip6t_IMQ.c
 --- linux-2.6.13/net/ipv6/netfilter/ip6t_IMQ.c	1970-01-01 00:00:00.000000000 +0000
 +++ linux-2.6.13-imq/net/ipv6/netfilter/ip6t_IMQ.c	2005-08-29 21:02:39.000000000 +0000
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/2.6.10-imq.patch?r1=1.1.2.9&r2=1.1.2.10&f=u




More information about the pld-cvs-commit mailing list