Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

4 files changed, 39 insertions, 24 deletions

diff --git a/include/linux/netfilter_ipv4/ipt_connbytes.h b/include/linux/netfilter_ipv4/ipt_connbytes.h
index b04dfa3083c9..f63e6ee91113 100644
--- a/include/linux/netfilter_ipv4/ipt_connbytes.h
+++ b/include/linux/netfilter_ipv4/ipt_connbytes.h
@@ -1,10 +1,10 @@
 #ifndef _IPT_CONNBYTES_H
 #define _IPT_CONNBYTES_H
 
-#include <net/netfilter/xt_connbytes.h>
+#include <linux/netfilter/xt_connbytes.h>
 #define ipt_connbytes_what xt_connbytes_what
 
-#define IPT_CONNBYTES_PKTS      XT_CONNBYTES_PACKETS
+#define IPT_CONNBYTES_PKTS      XT_CONNBYTES_PKTS
 #define IPT_CONNBYTES_BYTES     XT_CONNBYTES_BYTES
 #define IPT_CONNBYTES_AVGPKT    XT_CONNBYTES_AVGPKT
 
diff --git a/include/linux/netfilter_ipv4/ipt_policy.h b/include/linux/netfilter_ipv4/ipt_policy.h
index 7fd1bec453f1..a3f6eff39d33 100644
--- a/include/linux/netfilter_ipv4/ipt_policy.h
+++ b/include/linux/netfilter_ipv4/ipt_policy.h
@@ -27,16 +27,22 @@ struct ipt_policy_spec
                         reqid:1;
 };
 
+union ipt_policy_addr
+{
+        struct in_addr  a4;
+        struct in6_addr a6;
+};
+
 struct ipt_policy_elem
 {
-        u_int32_t       saddr;
-        u_int32_t       smask;
-        u_int32_t       daddr;
-        u_int32_t       dmask;
-        u_int32_t       spi;
-        u_int32_t       reqid;
-        u_int8_t        proto;
-        u_int8_t        mode;
+        union ipt_policy_addr   saddr;
+        union ipt_policy_addr   smask;
+        union ipt_policy_addr   daddr;
+        union ipt_policy_addr   dmask;
+        u_int32_t               spi;
+        u_int32_t               reqid;
+        u_int8_t                proto;
+        u_int8_t                mode;
 
         struct ipt_policy_spec  match;
         struct ipt_policy_spec  invert;
diff --git a/include/linux/netfilter_ipv6/ip6t_policy.h b/include/linux/netfilter_ipv6/ip6t_policy.h
index 5a93afcd2ff1..671bd818300f 100644
--- a/include/linux/netfilter_ipv6/ip6t_policy.h
+++ b/include/linux/netfilter_ipv6/ip6t_policy.h
@@ -27,16 +27,22 @@ struct ip6t_policy_spec
                         reqid:1;
 };
 
+union ip6t_policy_addr
+{
+        struct in_addr  a4;
+        struct in6_addr a6;
+};
+
 struct ip6t_policy_elem
 {
-        struct in6_addr saddr;
-        struct in6_addr smask;
-        struct in6_addr daddr;
-        struct in6_addr dmask;
-        u_int32_t       spi;
-        u_int32_t       reqid;
-        u_int8_t        proto;
-        u_int8_t        mode;
+        union ip6t_policy_addr  saddr;
+        union ip6t_policy_addr  smask;
+        union ip6t_policy_addr  daddr;
+        union ip6t_policy_addr  dmask;
+        u_int32_t               spi;
+        u_int32_t               reqid;
+        u_int8_t                proto;
+        u_int8_t                mode;
 
         struct ip6t_policy_spec match;
         struct ip6t_policy_spec invert;
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 67856eb93b43..dac43b15a5b0 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -88,12 +88,6 @@ extern struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX];
 extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
 extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
 
-static inline struct nf_conntrack_l3proto *
-__nf_ct_l3proto_find(u_int16_t l3proto)
-{
-        return nf_ct_l3protos[l3proto];
-}
-
 extern struct nf_conntrack_l3proto *
 nf_ct_l3proto_find_get(u_int16_t l3proto);
 
@@ -103,4 +97,13 @@ extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
 extern struct nf_conntrack_l3proto nf_conntrack_generic_l3proto;
+
+static inline struct nf_conntrack_l3proto *
+__nf_ct_l3proto_find(u_int16_t l3proto)
+{
+        if (unlikely(l3proto >= AF_MAX))
+                return &nf_conntrack_generic_l3proto;
+        return nf_ct_l3protos[l3proto];
+}
+
 #endif /*_NF_CONNTRACK_L3PROTO_H*/