SOURCES (LINUX_2_6): linux-2.6-pom-ng-branch.diff - bug+build fixes.
pluto
pluto at pld-linux.org
Mon Aug 1 12:48:09 CEST 2005
Author: pluto Date: Mon Aug 1 10:48:09 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- bug+build fixes.
---- Files affected:
SOURCES:
linux-2.6-pom-ng-branch.diff (1.1.2.14 -> 1.1.2.15)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-pom-ng-branch.diff
diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.14 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.15
--- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.14 Thu Jul 28 20:43:16 2005
+++ SOURCES/linux-2.6-pom-ng-branch.diff Mon Aug 1 12:48:03 2005
@@ -16,7 +16,7 @@
include/linux/netfilter_ipv4/ip_conntrack.h | 161 +
include/linux/netfilter_ipv4/ip_conntrack_core.h | 15
include/linux/netfilter_ipv4/ip_conntrack_h323.h | 38
- include/linux/netfilter_ipv4/ip_conntrack_mms.h | 37
+ include/linux/netfilter_ipv4/ip_conntrack_mms.h | 36
include/linux/netfilter_ipv4/ip_conntrack_pptp.h | 336 +++
include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h | 114 +
include/linux/netfilter_ipv4/ip_conntrack_protocol.h | 2
@@ -78,11 +78,11 @@
net/ipv4/netfilter/asn1_per.h | 83
net/ipv4/netfilter/ip_conntrack_core.c | 50
net/ipv4/netfilter/ip_conntrack_ftp.c | 12
- net/ipv4/netfilter/ip_conntrack_h323.c | 448 ++++
- net/ipv4/netfilter/ip_conntrack_h323_core.c | 38
- net/ipv4/netfilter/ip_conntrack_h323_h225.c | 406 +++
- net/ipv4/netfilter/ip_conntrack_h323_h245.c | 960 ++++++++
- net/ipv4/netfilter/ip_conntrack_mms.c | 353 +++
+ net/ipv4/netfilter/ip_conntrack_h323.c | 447 ++++
+ net/ipv4/netfilter/ip_conntrack_h323_core.c | 37
+ net/ipv4/netfilter/ip_conntrack_h323_h225.c | 405 +++
+ net/ipv4/netfilter/ip_conntrack_h323_h245.c | 959 ++++++++
+ net/ipv4/netfilter/ip_conntrack_mms.c | 352 +++
net/ipv4/netfilter/ip_conntrack_pptp.c | 790 +++++++
net/ipv4/netfilter/ip_conntrack_pptp_priv.h | 24
net/ipv4/netfilter/ip_conntrack_proto_generic.c | 2
@@ -93,8 +93,8 @@
net/ipv4/netfilter/ip_conntrack_proto_udp.c | 5
net/ipv4/netfilter/ip_conntrack_quake3.c | 202 +
net/ipv4/netfilter/ip_conntrack_standalone.c | 14
- net/ipv4/netfilter/ip_nat_h323.c | 197 +
- net/ipv4/netfilter/ip_nat_mms.c | 197 +
+ net/ipv4/netfilter/ip_nat_h323.c | 196 +
+ net/ipv4/netfilter/ip_nat_mms.c | 195 +
net/ipv4/netfilter/ip_nat_pptp.c | 388 +++
net/ipv4/netfilter/ip_nat_proto_gre.c | 214 +
net/ipv4/netfilter/ip_nat_quake3.c | 97
@@ -138,7 +138,7 @@
net/ipv4/netfilter/ipt_set.c | 112 +
net/ipv4/netfilter/ipt_string.c | 183 +
net/ipv4/netfilter/ipt_time.c | 179 +
- net/ipv4/netfilter/ipt_u32.c | 231 ++
+ net/ipv4/netfilter/ipt_u32.c | 233 ++
net/ipv4/netfilter/ipt_unclean.c | 611 +++++
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 549 ++++
net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 299 ++
@@ -172,12 +172,12 @@
net/netfilter/nf_conntrack_standalone.c | 821 +++++++
net/netfilter/nfnetlink.c | 343 +++
status | 44
- 174 files changed, 33701 insertions(+), 102 deletions(-)
+ 174 files changed, 33694 insertions(+), 102 deletions(-)
Index: include/linux/netfilter_ipv6/ip6t_fuzzy.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../trunk) (revision 6284)
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
@@ -203,7 +203,7 @@
Index: include/linux/netfilter_ipv6/ip6t_nth.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_nth.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_nth.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv6/ip6t_nth.h (.../trunk) (revision 6284)
@@ -0,0 +1,19 @@
+#ifndef _IP6T_NTH_H
+#define _IP6T_NTH_H
@@ -227,7 +227,7 @@
Index: include/linux/netfilter_ipv6/ip6t_ROUTE.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../trunk) (revision 6284)
@@ -0,0 +1,23 @@
+/* Header file for iptables ip6t_ROUTE target
+ *
@@ -255,7 +255,7 @@
Index: include/linux/netfilter_ipv6/ip6t_policy.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_policy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_policy.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv6/ip6t_policy.h (.../trunk) (revision 6284)
@@ -0,0 +1,52 @@
+#ifndef _IP6T_POLICY_H
+#define _IP6T_POLICY_H
@@ -312,7 +312,7 @@
Index: include/linux/netfilter_ipv6/ip6t_HL.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_HL.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_HL.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv6/ip6t_HL.h (.../trunk) (revision 6284)
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt at dns.toxicfilms.tv>
@@ -339,7 +339,7 @@
Index: include/linux/netfilter_ipv6/ip6t_REJECT.h
===================================================================
--- include/linux/netfilter_ipv6/ip6t_REJECT.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_REJECT.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv6/ip6t_REJECT.h (.../trunk) (revision 6284)
@@ -0,0 +1,18 @@
+#ifndef _IP6T_REJECT_H
+#define _IP6T_REJECT_H
@@ -361,8 +361,8 @@
+#endif /*_IP6T_REJECT_H*/
Index: include/linux/netfilter.h
===================================================================
---- include/linux/netfilter.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter.h (.../trunk) (revision 6277)
+--- include/linux/netfilter.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter.h (.../trunk) (revision 6284)
@@ -22,7 +22,7 @@
#define NF_MAX_VERDICT NF_STOP
@@ -374,8 +374,8 @@
Index: include/linux/netfilter_ipv4.h
===================================================================
---- include/linux/netfilter_ipv4.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter_ipv4.h (.../trunk) (revision 6277)
+--- include/linux/netfilter_ipv4.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter_ipv4.h (.../trunk) (revision 6284)
@@ -8,34 +8,6 @@
#include <linux/config.h>
#include <linux/netfilter.h>
@@ -413,8 +413,8 @@
#define NF_IP_PRE_ROUTING 0
Index: include/linux/netfilter_ipv6.h
===================================================================
---- include/linux/netfilter_ipv6.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter_ipv6.h (.../trunk) (revision 6277)
+--- include/linux/netfilter_ipv6.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter_ipv6.h (.../trunk) (revision 6284)
@@ -56,6 +56,7 @@
enum nf_ip6_hook_priorities {
@@ -432,8 +432,8 @@
#endif /*__LINUX_IP6_NETFILTER_H*/
Index: include/linux/skbuff.h
===================================================================
---- include/linux/skbuff.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/skbuff.h (.../trunk) (revision 6277)
+--- include/linux/skbuff.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/skbuff.h (.../trunk) (revision 6284)
@@ -264,6 +264,9 @@
__u32 nfcache;
__u32 nfctinfo;
@@ -473,8 +473,8 @@
#endif
Index: include/linux/sysctl.h
===================================================================
---- include/linux/sysctl.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/sysctl.h (.../trunk) (revision 6277)
+--- include/linux/sysctl.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/sysctl.h (.../trunk) (revision 6284)
@@ -193,6 +193,7 @@
NET_DECNET=15,
NET_ECONET=16,
@@ -528,8 +528,8 @@
{
Index: include/linux/netlink.h
===================================================================
---- include/linux/netlink.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netlink.h (.../trunk) (revision 6277)
+--- include/linux/netlink.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netlink.h (.../trunk) (revision 6284)
@@ -14,6 +14,7 @@
#define NETLINK_SELINUX 7 /* SELinux event notifications */
#define NETLINK_ARPD 8
@@ -541,7 +541,7 @@
Index: include/linux/netfilter/nf_conntrack_tcp.h
===================================================================
--- include/linux/netfilter/nf_conntrack_tcp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tcp.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_tcp.h (.../trunk) (revision 6284)
@@ -0,0 +1,63 @@
+/*
+ * TCP tracking.
@@ -609,7 +609,7 @@
Index: include/linux/netfilter/ipv4/nf_conntrack_icmp.h
===================================================================
--- include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../trunk) (revision 6284)
@@ -0,0 +1,17 @@
+/*
+ * ICMP tracking.
@@ -631,7 +631,7 @@
Index: include/linux/netfilter/ipv4/nf_conntrack_ipv4.h
===================================================================
--- include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../trunk) (revision 6284)
@@ -0,0 +1,40 @@
+/*
+ * IPv4 support for nf_conntrack.
@@ -676,7 +676,7 @@
Index: include/linux/netfilter/nf_conntrack_core.h
===================================================================
--- include/linux/netfilter/nf_conntrack_core.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_core.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_core.h (.../trunk) (revision 6284)
@@ -0,0 +1,72 @@
+/*
+ * This header is used to share core functionality between the
@@ -753,7 +753,7 @@
Index: include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h
===================================================================
--- include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../trunk) (revision 6284)
@@ -0,0 +1,27 @@
+/*
+ * ICMPv6 tracking.
@@ -785,7 +785,7 @@
Index: include/linux/netfilter/nf_conntrack_ftp.h
===================================================================
--- include/linux/netfilter/nf_conntrack_ftp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_ftp.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_ftp.h (.../trunk) (revision 6284)
@@ -0,0 +1,59 @@
+/*
+ * nf_conntrack_ftp.h
@@ -849,7 +849,7 @@
Index: include/linux/netfilter/nf_conntrack_sctp.h
===================================================================
--- include/linux/netfilter/nf_conntrack_sctp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_sctp.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_sctp.h (.../trunk) (revision 6284)
@@ -0,0 +1,30 @@
+/*
+ * SCTP tracking.
@@ -884,7 +884,7 @@
Index: include/linux/netfilter/nf_conntrack_tuple.h
===================================================================
--- include/linux/netfilter/nf_conntrack_tuple.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tuple.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_tuple.h (.../trunk) (revision 6284)
@@ -0,0 +1,201 @@
+/*
+ * Definitions and Declarations for tuple.
@@ -1090,7 +1090,7 @@
Index: include/linux/netfilter/nf_conntrack_helper.h
===================================================================
--- include/linux/netfilter/nf_conntrack_helper.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_helper.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_helper.h (.../trunk) (revision 6284)
@@ -0,0 +1,50 @@
+/*
+ * connection tracking helpers.
@@ -1145,7 +1145,7 @@
Index: include/linux/netfilter/nf_conntrack.h
===================================================================
--- include/linux/netfilter/nf_conntrack.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack.h (.../trunk) (revision 6284)
@@ -0,0 +1,302 @@
+/*
+ * Connection state tracking for netfilter. This is separated from,
@@ -1367,7 +1367,7 @@
+}
+
+/* decrement reference count on a conntrack */
-+extern inline void nf_ct_put(struct nf_conn *ct);
++extern void nf_ct_put(struct nf_conn *ct);
+
+/* call to create an explicit dependency on nf_conntrack. */
+extern void need_nf_conntrack(void);
@@ -1452,7 +1452,7 @@
Index: include/linux/netfilter/nf_conntrack_protocol.h
===================================================================
--- include/linux/netfilter/nf_conntrack_protocol.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_protocol.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_protocol.h (.../trunk) (revision 6284)
@@ -0,0 +1,105 @@
+/*
+ * Header for use in defining a given protocol for connection tracking.
@@ -1562,7 +1562,7 @@
Index: include/linux/netfilter/nf_conntrack_l3proto.h
===================================================================
--- include/linux/netfilter/nf_conntrack_l3proto.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_l3proto.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nf_conntrack_l3proto.h (.../trunk) (revision 6284)
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C)2003,2004 USAGI/WIDE Project
@@ -1660,7 +1660,7 @@
Index: include/linux/netfilter/nfnetlink.h
===================================================================
--- include/linux/netfilter/nfnetlink.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter/nfnetlink.h (.../trunk) (revision 6277)
++++ include/linux/netfilter/nfnetlink.h (.../trunk) (revision 6284)
@@ -0,0 +1,145 @@
+#ifndef _NFNETLINK_H
+#define _NFNETLINK_H
@@ -1810,7 +1810,7 @@
Index: include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
===================================================================
--- include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h (.../trunk) (revision 6284)
@@ -0,0 +1,114 @@
+#ifndef _CONNTRACK_PROTO_GRE_H
+#define _CONNTRACK_PROTO_GRE_H
@@ -1928,8 +1928,8 @@
+#endif /* _CONNTRACK_PROTO_GRE_H */
Index: include/linux/netfilter_ipv4/ipt_recent.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_recent.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter_ipv4/ipt_recent.h (.../trunk) (revision 6277)
+--- include/linux/netfilter_ipv4/ipt_recent.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter_ipv4/ipt_recent.h (.../trunk) (revision 6284)
@@ -2,7 +2,7 @@
#define _IPT_RECENT_H
@@ -1942,7 +1942,7 @@
Index: include/linux/netfilter_ipv4/ipt_set.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_set.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_set.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_set.h (.../trunk) (revision 6284)
@@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H
+#define _IPT_SET_H
@@ -1968,7 +1968,7 @@
Index: include/linux/netfilter_ipv4/ipt_connlimit.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_connlimit.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_connlimit.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_connlimit.h (.../trunk) (revision 6284)
@@ -0,0 +1,12 @@
+#ifndef _IPT_CONNLIMIT_H
+#define _IPT_CONNLIMIT_H
@@ -1985,7 +1985,7 @@
Index: include/linux/netfilter_ipv4/ip_conntrack_h323.h
===================================================================
--- include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../trunk) (revision 6284)
@@ -0,0 +1,38 @@
+#ifndef _IP_CONNTRACK_H323_H
+#define _IP_CONNTRACK_H323_H
@@ -2028,7 +2028,7 @@
Index: include/linux/netfilter_ipv4/ipt_ROUTE.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_ROUTE.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_ROUTE.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_ROUTE.h (.../trunk) (revision 6284)
@@ -0,0 +1,23 @@
+/* Header file for iptables ipt_ROUTE target
+ *
@@ -2055,8 +2055,8 @@
+#endif /*_IPT_ROUTE_H_target*/
Index: include/linux/netfilter_ipv4/ip_conntrack.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter_ipv4/ip_conntrack.h (.../trunk) (revision 6277)
+--- include/linux/netfilter_ipv4/ip_conntrack.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter_ipv4/ip_conntrack.h (.../trunk) (revision 6284)
@@ -65,8 +65,65 @@
/* Both together */
@@ -2297,7 +2297,7 @@
Index: include/linux/netfilter_ipv4/ipt_ipv4options.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_ipv4options.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_ipv4options.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_ipv4options.h (.../trunk) (revision 6284)
@@ -0,0 +1,21 @@
+#ifndef __ipt_ipv4options_h_included__
+#define __ipt_ipv4options_h_included__
@@ -2323,7 +2323,7 @@
Index: include/linux/netfilter_ipv4/ipt_policy.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_policy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_policy.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_policy.h (.../trunk) (revision 6284)
@@ -0,0 +1,52 @@
+#ifndef _IPT_POLICY_H
+#define _IPT_POLICY_H
@@ -2380,7 +2380,7 @@
Index: include/linux/netfilter_ipv4/ipt_layer7.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_layer7.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_layer7.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_layer7.h (.../trunk) (revision 6284)
@@ -0,0 +1,26 @@
+/*
+ By Matthew Strait <quadong at users.sf.net>, Dec 2003.
@@ -2410,8 +2410,8 @@
+#endif /* _IPT_LAYER7_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_core.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_core.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter_ipv4/ip_conntrack_core.h (.../trunk) (revision 6277)
+--- include/linux/netfilter_ipv4/ip_conntrack_core.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter_ipv4/ip_conntrack_core.h (.../trunk) (revision 6284)
@@ -34,15 +34,26 @@
ip_conntrack_find_get(const struct ip_conntrack_tuple *tuple,
const struct ip_conntrack *ignored_conntrack);
@@ -2443,8 +2443,8 @@
extern struct list_head *ip_conntrack_hash;
Index: include/linux/netfilter_ipv4/ipt_addrtype.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_addrtype.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter_ipv4/ipt_addrtype.h (.../trunk) (revision 6277)
+--- include/linux/netfilter_ipv4/ipt_addrtype.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter_ipv4/ipt_addrtype.h (.../trunk) (revision 6284)
@@ -4,8 +4,8 @@
struct ipt_addrtype_info {
u_int16_t source; /* source-type mask */
@@ -2458,8 +2458,8 @@
#endif
Index: include/linux/netfilter_ipv4/ip_conntrack_protocol.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../branches/vanilla-2.6.12.x) (revision 6277)
-+++ include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../trunk) (revision 6277)
+--- include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../branches/vanilla-2.6.12.x) (revision 6284)
++++ include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../trunk) (revision 6284)
@@ -34,7 +34,7 @@
/* Returns verdict for packet, or -1 for invalid. */
@@ -2472,7 +2472,7 @@
Index: include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
--- include/linux/netfilter_ipv4/ip_set_nethash.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_nethash.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_set_nethash.h (.../trunk) (revision 6284)
@@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
@@ -2532,7 +2532,7 @@
Index: include/linux/netfilter_ipv4/ipt_IPMARK.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_IPMARK.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_IPMARK.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_IPMARK.h (.../trunk) (revision 6284)
@@ -0,0 +1,13 @@
+#ifndef _IPT_IPMARK_H_target
+#define _IPT_IPMARK_H_target
@@ -2550,7 +2550,7 @@
Index: include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
--- include/linux/netfilter_ipv4/ip_set_jhash.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_jhash.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_set_jhash.h (.../trunk) (revision 6284)
@@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H
@@ -2703,7 +2703,7 @@
Index: include/linux/netfilter_ipv4/ipt_nth.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_nth.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_nth.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_nth.h (.../trunk) (revision 6284)
@@ -0,0 +1,19 @@
+#ifndef _IPT_NTH_H
+#define _IPT_NTH_H
@@ -2727,7 +2727,7 @@
Index: include/linux/netfilter_ipv4/ipt_quota.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_quota.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_quota.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_quota.h (.../trunk) (revision 6284)
@@ -0,0 +1,12 @@
+#ifndef _IPT_QUOTA_H
+#define _IPT_QUOTA_H
@@ -2744,7 +2744,7 @@
Index: include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
--- include/linux/netfilter_ipv4/ip_set_ipmap.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_ipmap.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_set_ipmap.h (.../trunk) (revision 6284)
@@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H
@@ -2805,7 +2805,7 @@
Index: include/linux/netfilter_ipv4/ipt_time.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_time.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_time.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_time.h (.../trunk) (revision 6284)
@@ -0,0 +1,18 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
@@ -2828,7 +2828,7 @@
Index: include/linux/netfilter_ipv4/ip_nat_pptp.h
===================================================================
--- include/linux/netfilter_ipv4/ip_nat_pptp.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_nat_pptp.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_nat_pptp.h (.../trunk) (revision 6284)
@@ -0,0 +1,11 @@
+/* PPTP constants and structs */
+#ifndef _NAT_PPTP_H
@@ -2844,7 +2844,7 @@
Index: include/linux/netfilter_ipv4/ipt_geoip.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_geoip.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_geoip.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_geoip.h (.../trunk) (revision 6284)
@@ -0,0 +1,50 @@
+/* ipt_geoip.h header file for libipt_geoip.c and ipt_geoip.c
+ *
@@ -2899,7 +2899,7 @@
Index: include/linux/netfilter_ipv4/ip_conntrack_quake3.h
===================================================================
--- include/linux/netfilter_ipv4/ip_conntrack_quake3.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_quake3.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_conntrack_quake3.h (.../trunk) (revision 6284)
@@ -0,0 +1,22 @@
+#ifndef _IP_CT_QUAKE3
+#define _IP_CT_QUAKE3
@@ -2926,7 +2926,7 @@
Index: include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
--- include/linux/netfilter_ipv4/ip_set_portmap.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_portmap.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_set_portmap.h (.../trunk) (revision 6284)
@@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H
@@ -2956,16 +2956,15 @@
Index: include/linux/netfilter_ipv4/ip_conntrack_mms.h
===================================================================
--- include/linux/netfilter_ipv4/ip_conntrack_mms.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_mms.h (.../trunk) (revision 6277)
-@@ -0,0 +1,37 @@
++++ include/linux/netfilter_ipv4/ip_conntrack_mms.h (.../trunk) (revision 6284)
+@@ -0,0 +1,36 @@
+#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H
+/* MMS tracking. */
+
+#ifdef __KERNEL__
-+#include <linux/netfilter_ipv4/lockhelp.h>
+
-+DECLARE_LOCK_EXTERN(ip_mms_lock);
++extern spinlock_t ip_mms_lock;
+
+#define MMS_PORT 1755
+#define MMS_SRV_MSG_ID 196610
@@ -2998,7 +2997,7 @@
Index: include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
--- include/linux/netfilter_ipv4/ip_set_macipmap.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_macipmap.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ip_set_macipmap.h (.../trunk) (revision 6284)
@@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H
@@ -3041,7 +3040,7 @@
Index: include/linux/netfilter_ipv4/ipt_psd.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_psd.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_psd.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_psd.h (.../trunk) (revision 6284)
@@ -0,0 +1,40 @@
+#ifndef _IPT_PSD_H
+#define _IPT_PSD_H
@@ -3086,7 +3085,7 @@
Index: include/linux/netfilter_ipv4/ipt_fuzzy.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_fuzzy.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_fuzzy.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_fuzzy.h (.../trunk) (revision 6284)
@@ -0,0 +1,21 @@
+#ifndef _IPT_FUZZY_H
+#define _IPT_FUZZY_H
@@ -3112,7 +3111,7 @@
Index: include/linux/netfilter_ipv4/ipt_osf.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_osf.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_osf.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_osf.h (.../trunk) (revision 6284)
@@ -0,0 +1,151 @@
+/*
+ * ipt_osf.h
@@ -3268,7 +3267,7 @@
Index: include/linux/netfilter_ipv4/ipt_ipp2p.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_ipp2p.h (.../branches/vanilla-2.6.12.x) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_ipp2p.h (.../trunk) (revision 6277)
++++ include/linux/netfilter_ipv4/ipt_ipp2p.h (.../trunk) (revision 6284)
@@ -0,0 +1,29 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
@@ -3302,7 +3301,7 @@
Index: include/linux/netfilter_ipv4/ipt_account.h
===================================================================
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-pom-ng-branch.diff?r1=1.1.2.14&r2=1.1.2.15&f=u
More information about the pld-cvs-commit
mailing list