SOURCES (LINUX_2_6_11): linux-2.6-pom-ng-branch.diff - updated fro...
pluto
pluto at pld-linux.org
Sun Jun 26 13:48:35 CEST 2005
Author: pluto Date: Sun Jun 26 11:48:35 2005 GMT
Module: SOURCES Tag: LINUX_2_6_11
---- Log message:
- updated from svn.
---- Files affected:
SOURCES:
linux-2.6-pom-ng-branch.diff (1.1.2.12 -> 1.1.2.12.2.1)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-pom-ng-branch.diff
diff -u SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.12 SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.12.2.1
--- SOURCES/linux-2.6-pom-ng-branch.diff:1.1.2.12 Sat Jun 11 19:05:05 2005
+++ SOURCES/linux-2.6-pom-ng-branch.diff Sun Jun 26 13:48:29 2005
@@ -178,8 +178,8 @@
Index: include/linux/netfilter_ipv6/ip6t_fuzzy.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv6/ip6t_fuzzy.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
@@ -204,8 +204,8 @@
+#endif /*_IP6T_FUZZY_H*/
Index: include/linux/netfilter_ipv6/ip6t_nth.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_nth.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_nth.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6/ip6t_nth.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv6/ip6t_nth.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,19 @@
+#ifndef _IP6T_NTH_H
+#define _IP6T_NTH_H
@@ -228,8 +228,8 @@
+#endif /*_IP6T_NTH_H*/
Index: include/linux/netfilter_ipv6/ip6t_ROUTE.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv6/ip6t_ROUTE.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,23 @@
+/* Header file for iptables ip6t_ROUTE target
+ *
@@ -256,8 +256,8 @@
+#endif /*_IP6T_ROUTE_H_target*/
Index: include/linux/netfilter_ipv6/ip6t_policy.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_policy.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_policy.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6/ip6t_policy.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv6/ip6t_policy.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,52 @@
+#ifndef _IP6T_POLICY_H
+#define _IP6T_POLICY_H
@@ -313,8 +313,8 @@
+#endif /* _IP6T_POLICY_H */
Index: include/linux/netfilter_ipv6/ip6t_HL.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_HL.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_HL.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6/ip6t_HL.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv6/ip6t_HL.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt at dns.toxicfilms.tv>
@@ -340,8 +340,8 @@
+#endif
Index: include/linux/netfilter_ipv6/ip6t_REJECT.h
===================================================================
---- include/linux/netfilter_ipv6/ip6t_REJECT.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv6/ip6t_REJECT.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6/ip6t_REJECT.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv6/ip6t_REJECT.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,18 @@
+#ifndef _IP6T_REJECT_H
+#define _IP6T_REJECT_H
@@ -363,8 +363,8 @@
+#endif /*_IP6T_REJECT_H*/
Index: include/linux/netfilter.h
===================================================================
---- include/linux/netfilter.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter.h (.../trunk) (revision 6073)
+--- include/linux/netfilter.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter.h (.../patched-2.6.11.x) (revision 6185)
@@ -21,7 +21,7 @@
#define NF_MAX_VERDICT NF_REPEAT
@@ -376,8 +376,8 @@
Index: include/linux/netfilter_ipv4.h
===================================================================
---- include/linux/netfilter_ipv4.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4.h (.../patched-2.6.11.x) (revision 6185)
@@ -8,34 +8,6 @@
#include <linux/config.h>
#include <linux/netfilter.h>
@@ -425,8 +425,8 @@
Index: include/linux/netfilter_ipv6.h
===================================================================
---- include/linux/netfilter_ipv6.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv6.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv6.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv6.h (.../patched-2.6.11.x) (revision 6185)
@@ -56,6 +56,7 @@
enum nf_ip6_hook_priorities {
@@ -444,8 +444,8 @@
#endif /*__LINUX_IP6_NETFILTER_H*/
Index: include/linux/skbuff.h
===================================================================
---- include/linux/skbuff.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/skbuff.h (.../trunk) (revision 6073)
+--- include/linux/skbuff.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/skbuff.h (.../patched-2.6.11.x) (revision 6185)
@@ -251,6 +251,9 @@
__u32 nfcache;
__u32 nfctinfo;
@@ -485,8 +485,8 @@
#endif
Index: include/linux/sysctl.h
===================================================================
---- include/linux/sysctl.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/sysctl.h (.../trunk) (revision 6073)
+--- include/linux/sysctl.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/sysctl.h (.../patched-2.6.11.x) (revision 6185)
@@ -192,6 +192,7 @@
NET_DECNET=15,
NET_ECONET=16,
@@ -540,8 +540,8 @@
{
Index: include/linux/netlink.h
===================================================================
---- include/linux/netlink.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netlink.h (.../trunk) (revision 6073)
+--- include/linux/netlink.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netlink.h (.../patched-2.6.11.x) (revision 6185)
@@ -14,6 +14,7 @@
#define NETLINK_SELINUX 7 /* SELinux event notifications */
#define NETLINK_ARPD 8
@@ -552,8 +552,8 @@
#define NETLINK_DNRTMSG 14 /* DECnet routing messages */
Index: include/linux/netfilter/nf_conntrack_tcp.h
===================================================================
---- include/linux/netfilter/nf_conntrack_tcp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tcp.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_tcp.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_tcp.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,63 @@
+/*
+ * TCP tracking.
@@ -620,8 +620,8 @@
+#endif /* _NF_CONNTRACK_TCP_H */
Index: include/linux/netfilter/ipv4/nf_conntrack_icmp.h
===================================================================
---- include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/ipv4/nf_conntrack_icmp.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,17 @@
+/*
+ * ICMP tracking.
@@ -642,8 +642,8 @@
+#endif /* _NF_CONNTRACK_ICMP_H */
Index: include/linux/netfilter/ipv4/nf_conntrack_ipv4.h
===================================================================
---- include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/ipv4/nf_conntrack_ipv4.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,40 @@
+/*
+ * IPv4 support for nf_conntrack.
@@ -687,8 +687,8 @@
+#endif /*_NF_CONNTRACK_IPV4_H*/
Index: include/linux/netfilter/nf_conntrack_core.h
===================================================================
---- include/linux/netfilter/nf_conntrack_core.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_core.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_core.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_core.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,72 @@
+/*
+ * This header is used to share core functionality between the
@@ -764,8 +764,8 @@
+#endif /* _NF_CONNTRACK_CORE_H */
Index: include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h
===================================================================
---- include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,27 @@
+/*
+ * ICMPv6 tracking.
@@ -796,8 +796,8 @@
+#endif /* _NF_CONNTRACK_ICMPV6_H */
Index: include/linux/netfilter/nf_conntrack_ftp.h
===================================================================
---- include/linux/netfilter/nf_conntrack_ftp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_ftp.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_ftp.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_ftp.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,59 @@
+/*
+ * nf_conntrack_ftp.h
@@ -860,8 +860,8 @@
+#endif /* _NF_CONNTRACK_FTP_H */
Index: include/linux/netfilter/nf_conntrack_sctp.h
===================================================================
---- include/linux/netfilter/nf_conntrack_sctp.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_sctp.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_sctp.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_sctp.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,30 @@
+/*
+ * SCTP tracking.
@@ -895,8 +895,8 @@
+#endif /* _NF_CONNTRACK_SCTP_H */
Index: include/linux/netfilter/nf_conntrack_tuple.h
===================================================================
---- include/linux/netfilter/nf_conntrack_tuple.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_tuple.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_tuple.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_tuple.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,201 @@
+/*
+ * Definitions and Declarations for tuple.
@@ -1101,8 +1101,8 @@
+#endif /* _NF_CONNTRACK_TUPLE_H */
Index: include/linux/netfilter/nf_conntrack_helper.h
===================================================================
---- include/linux/netfilter/nf_conntrack_helper.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_helper.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_helper.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_helper.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,50 @@
+/*
+ * connection tracking helpers.
@@ -1156,8 +1156,8 @@
+#endif /*_NF_CONNTRACK_HELPER_H*/
Index: include/linux/netfilter/nf_conntrack.h
===================================================================
---- include/linux/netfilter/nf_conntrack.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,302 @@
+/*
+ * Connection state tracking for netfilter. This is separated from,
@@ -1463,8 +1463,8 @@
+#endif /* _NF_CONNTRACK_H */
Index: include/linux/netfilter/nf_conntrack_protocol.h
===================================================================
---- include/linux/netfilter/nf_conntrack_protocol.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_protocol.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_protocol.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_protocol.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,105 @@
+/*
+ * Header for use in defining a given protocol for connection tracking.
@@ -1573,8 +1573,8 @@
+#endif /*_NF_CONNTRACK_PROTOCOL_H*/
Index: include/linux/netfilter/nf_conntrack_l3proto.h
===================================================================
---- include/linux/netfilter/nf_conntrack_l3proto.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nf_conntrack_l3proto.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nf_conntrack_l3proto.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nf_conntrack_l3proto.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C)2003,2004 USAGI/WIDE Project
@@ -1671,8 +1671,8 @@
+#endif /*_NF_CONNTRACK_L3PROTO_H*/
Index: include/linux/netfilter/nfnetlink.h
===================================================================
---- include/linux/netfilter/nfnetlink.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter/nfnetlink.h (.../trunk) (revision 6073)
+--- include/linux/netfilter/nfnetlink.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter/nfnetlink.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,123 @@
+#ifndef _NFNETLINK_H
+#define _NFNETLINK_H
@@ -1799,8 +1799,8 @@
+#endif /* _NFNETLINK_H */
Index: include/linux/netfilter_ipv4/ipt_recent.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_recent.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ipt_recent.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_recent.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4/ipt_recent.h (.../patched-2.6.11.x) (revision 6185)
@@ -2,7 +2,7 @@
#define _IPT_RECENT_H
@@ -1812,8 +1812,8 @@
#define IPT_RECENT_SET 2
Index: include/linux/netfilter_ipv4/ipt_set.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_set.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_set.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_set.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_set.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H
+#define _IPT_SET_H
@@ -1838,8 +1838,8 @@
+#endif /*_IPT_SET_H*/
Index: include/linux/netfilter_ipv4/ipt_connlimit.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_connlimit.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_connlimit.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_connlimit.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_connlimit.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,12 @@
+#ifndef _IPT_CONNLIMIT_H
+#define _IPT_CONNLIMIT_H
@@ -1855,8 +1855,8 @@
+#endif /* _IPT_CONNLIMIT_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_h323.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_conntrack_h323.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,38 @@
+#ifndef _IP_CONNTRACK_H323_H
+#define _IP_CONNTRACK_H323_H
@@ -1898,8 +1898,8 @@
+#endif /* _IP_CONNTRACK_H323_H */
Index: include/linux/netfilter_ipv4/ipt_ROUTE.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_ROUTE.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_ROUTE.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_ROUTE.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_ROUTE.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,23 @@
+/* Header file for iptables ipt_ROUTE target
+ *
@@ -1926,8 +1926,8 @@
+#endif /*_IPT_ROUTE_H_target*/
Index: include/linux/netfilter_ipv4/ip_conntrack.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4/ip_conntrack.h (.../patched-2.6.11.x) (revision 6185)
@@ -65,15 +65,72 @@
/* Both together */
@@ -2227,8 +2227,8 @@
enum ip_nat_manip_type manip)
Index: include/linux/netfilter_ipv4/ipt_ipv4options.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_ipv4options.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_ipv4options.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_ipv4options.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_ipv4options.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,21 @@
+#ifndef __ipt_ipv4options_h_included__
+#define __ipt_ipv4options_h_included__
@@ -2253,8 +2253,8 @@
+#endif /* __ipt_ipv4options_h_included__ */
Index: include/linux/netfilter_ipv4/ipt_policy.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_policy.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_policy.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_policy.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_policy.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,52 @@
+#ifndef _IPT_POLICY_H
+#define _IPT_POLICY_H
@@ -2310,8 +2310,8 @@
+#endif /* _IPT_POLICY_H */
Index: include/linux/netfilter_ipv4/ipt_layer7.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_layer7.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_layer7.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_layer7.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_layer7.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,26 @@
+/*
+ By Matthew Strait <quadong at users.sf.net>, Dec 2003.
@@ -2341,8 +2341,8 @@
+#endif /* _IPT_LAYER7_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_core.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_core.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack_core.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_core.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4/ip_conntrack_core.h (.../patched-2.6.11.x) (revision 6185)
@@ -39,10 +39,14 @@
/* Confirm a connection: returns NF_DROP if packet must be dropped. */
static inline int ip_conntrack_confirm(struct sk_buff **pskb)
@@ -2362,8 +2362,8 @@
extern struct list_head *ip_conntrack_hash;
Index: include/linux/netfilter_ipv4/ip_conntrack_ftp.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4/ip_conntrack_ftp.h (.../patched-2.6.11.x) (revision 6185)
@@ -31,6 +31,7 @@
struct ip_conntrack_expect;
@@ -2380,8 +2380,8 @@
#endif /* _IP_CONNTRACK_FTP_H */
Index: include/linux/netfilter_ipv4/ipt_addrtype.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_addrtype.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ipt_addrtype.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_addrtype.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4/ipt_addrtype.h (.../patched-2.6.11.x) (revision 6185)
@@ -4,8 +4,8 @@
struct ipt_addrtype_info {
u_int16_t source; /* source-type mask */
@@ -2395,8 +2395,8 @@
#endif
Index: include/linux/netfilter_ipv4/ip_conntrack_protocol.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4/ip_conntrack_protocol.h (.../patched-2.6.11.x) (revision 6185)
@@ -10,6 +10,8 @@
/* Protocol number. */
u_int8_t proto;
@@ -2444,8 +2444,8 @@
{
Index: include/linux/netfilter_ipv4/ip_set_nethash.h
===================================================================
---- include/linux/netfilter_ipv4/ip_set_nethash.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_nethash.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_set_nethash.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_set_nethash.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
@@ -2504,8 +2504,8 @@
+#endif /* __IP_SET_NETHASH_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_netlink.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_conntrack_netlink.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,113 @@
+#ifndef _NFNETLINK_CONNTRACK_H
+#define _NFNETLINK_CONNTRACK_H
@@ -2622,8 +2622,8 @@
+#endif /* _NFNETLINK_CONNTRACK_H */
Index: include/linux/netfilter_ipv4/ipt_IPMARK.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_IPMARK.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_IPMARK.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_IPMARK.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_IPMARK.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,13 @@
+#ifndef _IPT_IPMARK_H_target
+#define _IPT_IPMARK_H_target
@@ -2640,8 +2640,8 @@
+#endif /*_IPT_IPMARK_H_target*/
Index: include/linux/netfilter_ipv4/ip_set_jhash.h
===================================================================
---- include/linux/netfilter_ipv4/ip_set_jhash.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_jhash.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_set_jhash.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_set_jhash.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H
@@ -2793,8 +2793,8 @@
+#endif /* _LINUX_IPSET_JHASH_H */
Index: include/linux/netfilter_ipv4/ipt_nth.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_nth.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_nth.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_nth.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_nth.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,19 @@
+#ifndef _IPT_NTH_H
+#define _IPT_NTH_H
@@ -2817,8 +2817,8 @@
+#endif /*_IPT_NTH_H*/
Index: include/linux/netfilter_ipv4/ipt_quota.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_quota.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_quota.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_quota.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_quota.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,12 @@
+#ifndef _IPT_QUOTA_H
+#define _IPT_QUOTA_H
@@ -2834,8 +2834,8 @@
+#endif /*_IPT_QUOTA_H*/
Index: include/linux/netfilter_ipv4/ip_conntrack_helper.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_helper.h (.../branches/linux-2.6.11.8) (revision 6073)
-+++ include/linux/netfilter_ipv4/ip_conntrack_helper.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_helper.h (.../vanilla-2.6.11.x) (revision 6185)
++++ include/linux/netfilter_ipv4/ip_conntrack_helper.h (.../patched-2.6.11.x) (revision 6185)
@@ -9,6 +9,8 @@
{
struct list_head list; /* Internal use. */
@@ -2864,8 +2864,8 @@
#endif /*_IP_CONNTRACK_HELPER_H*/
Index: include/linux/netfilter_ipv4/ip_set_ipmap.h
===================================================================
---- include/linux/netfilter_ipv4/ip_set_ipmap.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_ipmap.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_set_ipmap.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_set_ipmap.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H
@@ -2925,8 +2925,8 @@
+#endif /* __IP_SET_IPMAP_H */
Index: include/linux/netfilter_ipv4/ipt_time.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_time.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_time.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_time.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_time.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,15 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
@@ -2945,8 +2945,8 @@
+#endif /* __ipt_time_h_included__ */
Index: include/linux/netfilter_ipv4/ipt_geoip.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_geoip.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_geoip.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_geoip.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_geoip.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,50 @@
+/* ipt_geoip.h header file for libipt_geoip.c and ipt_geoip.c
+ *
@@ -3000,8 +3000,8 @@
+
Index: include/linux/netfilter_ipv4/ip_set_portmap.h
===================================================================
---- include/linux/netfilter_ipv4/ip_set_portmap.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_portmap.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_set_portmap.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_set_portmap.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H
@@ -3030,8 +3030,8 @@
+#endif /* __IP_SET_PORTMAP_H */
Index: include/linux/netfilter_ipv4/ip_conntrack_mms.h
===================================================================
---- include/linux/netfilter_ipv4/ip_conntrack_mms.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_conntrack_mms.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_conntrack_mms.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_conntrack_mms.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,37 @@
+#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H
@@ -3072,8 +3072,8 @@
+#endif /* _IP_CONNTRACK_MMS_H */
Index: include/linux/netfilter_ipv4/ip_set_macipmap.h
===================================================================
---- include/linux/netfilter_ipv4/ip_set_macipmap.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ip_set_macipmap.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ip_set_macipmap.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ip_set_macipmap.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H
@@ -3115,8 +3115,8 @@
+#endif /* __IP_SET_MACIPMAP_H */
Index: include/linux/netfilter_ipv4/ipt_psd.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_psd.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_psd.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_psd.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_psd.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,40 @@
+#ifndef _IPT_PSD_H
+#define _IPT_PSD_H
@@ -3160,8 +3160,8 @@
+#endif /*_IPT_PSD_H*/
Index: include/linux/netfilter_ipv4/ipt_fuzzy.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_fuzzy.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_fuzzy.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_fuzzy.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_fuzzy.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,21 @@
+#ifndef _IPT_FUZZY_H
+#define _IPT_FUZZY_H
@@ -3186,8 +3186,8 @@
+#endif /*_IPT_FUZZY_H*/
Index: include/linux/netfilter_ipv4/ipt_osf.h
===================================================================
---- include/linux/netfilter_ipv4/ipt_osf.h (.../branches/linux-2.6.11.8) (revision 0)
-+++ include/linux/netfilter_ipv4/ipt_osf.h (.../trunk) (revision 6073)
+--- include/linux/netfilter_ipv4/ipt_osf.h (.../vanilla-2.6.11.x) (revision 0)
++++ include/linux/netfilter_ipv4/ipt_osf.h (.../patched-2.6.11.x) (revision 6185)
@@ -0,0 +1,150 @@
<<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.12&r2=1.1.2.12.2.1&f=u
More information about the pld-cvs-commit
mailing list