MIPS: Lasat: Convert to proc_fops / seq_file

[safe/jmp/linux-2.6] / net / ipv6 / netfilter.c

diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 8c6c5e7..d5ed92b 100644 (file)
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -12,6 +12,7 @@
 
 int ip6_route_me_harder(struct sk_buff *skb)
 {
+       struct net *net = dev_net(skb_dst(skb)->dev);
        struct ipv6hdr *iph = ipv6_hdr(skb);
        struct dst_entry *dst;
        struct flowi fl = {
@@ -23,26 +24,32 @@ int ip6_route_me_harder(struct sk_buff *skb)
                    .saddr = iph->saddr, } },
        };
 
-       dst = ip6_route_output(&init_net, skb->sk, &fl);
+       dst = ip6_route_output(net, skb->sk, &fl);
 
 #ifdef CONFIG_XFRM
        if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
-           xfrm_decode_session(skb, &fl, AF_INET6) == 0)
-               if (xfrm_lookup(&skb->dst, &fl, skb->sk, 0))
+           xfrm_decode_session(skb, &fl, AF_INET6) == 0) {
+               struct dst_entry *dst2 = skb_dst(skb);
+
+               if (xfrm_lookup(net, &dst2, &fl, skb->sk, 0)) {
+                       skb_dst_set(skb, NULL);
                        return -1;
+               }
+               skb_dst_set(skb, dst2);
+       }
 #endif
 
        if (dst->error) {
-               IP6_INC_STATS(ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
+               IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
                LIMIT_NETDEBUG(KERN_DEBUG "ip6_route_me_harder: No more route.\n");
                dst_release(dst);
                return -EINVAL;
        }
 
        /* Drop old route. */
-       dst_release(skb->dst);
+       skb_dst_drop(skb);
 
-       skb->dst = dst;
+       skb_dst_set(skb, dst);
        return 0;
 }
 EXPORT_SYMBOL(ip6_route_me_harder);
@@ -55,6 +62,7 @@ EXPORT_SYMBOL(ip6_route_me_harder);
 struct ip6_rt_info {
        struct in6_addr daddr;
        struct in6_addr saddr;
+       u_int32_t mark;
 };
 
 static void nf_ip6_saveroute(const struct sk_buff *skb,
@@ -67,6 +75,7 @@ static void nf_ip6_saveroute(const struct sk_buff *skb,
 
                rt_info->daddr = iph->daddr;
                rt_info->saddr = iph->saddr;
+               rt_info->mark = skb->mark;
        }
 }
 
@@ -78,7 +87,8 @@ static int nf_ip6_reroute(struct sk_buff *skb,
        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))
+                   !ipv6_addr_equal(&iph->saddr, &rt_info->saddr) ||
+                   skb->mark != rt_info->mark)
                        return ip6_route_me_harder(skb);
        }
        return 0;