From a5b3b13cc6c5cc75b2bc1ae74ced95af437a259f Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 14 Oct 2008 22:55:21 -0700
Subject: [PATCH] --- yaml --- r: 115017 b: refs/heads/master c:
 eef9d90dcde7bb4d029b67ed36457efc4970d5a2 h: refs/heads/master i:   115015:
 77dc53f84cce061b7b3b872c7c85c4f75d1f37d3 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv6/netfilter.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f09c4f113e1a..481dd9bbebf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ef079ccc1d934c5f9966f2bfcd5dbbef8f7a0a7
+refs/heads/master: eef9d90dcde7bb4d029b67ed36457efc4970d5a2
diff --git a/trunk/net/ipv6/netfilter.c b/trunk/net/ipv6/netfilter.c
index 6b29b03925f1..fd5b3a4e3329 100644
--- a/trunk/net/ipv6/netfilter.c
+++ b/trunk/net/ipv6/netfilter.c
@@ -12,6 +12,7 @@
 
 int ip6_route_me_harder(struct sk_buff *skb)
 {
+	struct net *net = dev_net(skb->dst->dev);
 	struct ipv6hdr *iph = ipv6_hdr(skb);
 	struct dst_entry *dst;
 	struct flowi fl = {
@@ -23,7 +24,7 @@ int ip6_route_me_harder(struct sk_buff *skb)
 		    .saddr = iph->saddr, } },
 	};
 
-	dst = ip6_route_output(dev_net(skb->dst->dev), skb->sk, &fl);
+	dst = ip6_route_output(net, skb->sk, &fl);
 
 #ifdef CONFIG_XFRM
 	if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
@@ -33,8 +34,7 @@ int ip6_route_me_harder(struct sk_buff *skb)
 #endif
 
 	if (dst->error) {
-		IP6_INC_STATS(&init_net, 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;