[NETFILTER]: nf_nat: add UDP-Lite support

[net-next-2.6.git] / net / ipv6 / netfilter.c

diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 281f732e3c97f24f1b0bd59f56779e49f14b00df..aed51bcc66b44d5df82bd05775d674333a9e09c0 100644 (file)
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -8,6 +8,7 @@
 #include <net/ip6_route.h>
 #include <net/xfrm.h>
 #include <net/ip6_checksum.h>
+#include <net/netfilter/nf_queue.h>
 
 int ip6_route_me_harder(struct sk_buff *skb)
 {
@@ -22,7 +23,7 @@ int ip6_route_me_harder(struct sk_buff *skb)
                    .saddr = iph->saddr, } },
        };
 
-       dst = ip6_route_output(skb->sk, &fl);
+       dst = ip6_route_output(&init_net, skb->sk, &fl);
 
 #ifdef CONFIG_XFRM
        if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
@@ -56,11 +57,12 @@ struct ip6_rt_info {
        struct in6_addr saddr;
 };
 
-static void nf_ip6_saveroute(const struct sk_buff *skb, struct nf_info *info)
+static void nf_ip6_saveroute(const struct sk_buff *skb,
+                            struct nf_queue_entry *entry)
 {
-       struct ip6_rt_info *rt_info = nf_info_reroute(info);
+       struct ip6_rt_info *rt_info = nf_queue_entry_reroute(entry);
 
-       if (info->hook == NF_INET_LOCAL_OUT) {
+       if (entry->hook == NF_INET_LOCAL_OUT) {
                struct ipv6hdr *iph = ipv6_hdr(skb);
 
                rt_info->daddr = iph->daddr;
@@ -68,11 +70,12 @@ static void nf_ip6_saveroute(const struct sk_buff *skb, struct nf_info *info)
        }
 }
 
-static int nf_ip6_reroute(struct sk_buff *skb, const struct nf_info *info)
+static int nf_ip6_reroute(struct sk_buff *skb,
+                         const struct nf_queue_entry *entry)
 {
-       struct ip6_rt_info *rt_info = nf_info_reroute(info);
+       struct ip6_rt_info *rt_info = nf_queue_entry_reroute(entry);
 
-       if (info->hook == NF_INET_LOCAL_OUT) {
+       if (entry->hook == NF_INET_LOCAL_OUT) {
                struct ipv6hdr *iph = ipv6_hdr(skb);
                if (!ipv6_addr_equal(&iph->daddr, &rt_info->daddr) ||
                    !ipv6_addr_equal(&iph->saddr, &rt_info->saddr))
@@ -83,7 +86,7 @@ static int nf_ip6_reroute(struct sk_buff *skb, const struct nf_info *info)
 
 static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl)
 {
-       *dst = ip6_route_output(NULL, fl);
+       *dst = ip6_route_output(&init_net, NULL, fl);
        return (*dst)->error;
 }
 
@@ -121,7 +124,7 @@ __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
 
 EXPORT_SYMBOL(nf_ip6_checksum);
 
-static struct nf_afinfo nf_ip6_afinfo = {
+static const struct nf_afinfo nf_ip6_afinfo = {
        .family         = AF_INET6,
        .checksum       = nf_ip6_checksum,
        .route          = nf_ip6_route,