From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 08:15:59 +0000 (-0700)
Subject: [SIT]: Use proper net in hash-lookup functions.
X-Git-Tag: v2.6.26-rc1~1138^2~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fcee5ec9fdd2b27bce2a6ae8cd8161ad9a8899df;p=linux-2.6-omap-h63xx.git

[SIT]: Use proper net in hash-lookup functions.

Replace introduced in the previous patch init_net stubs
with the proper net pointer.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 66cf0be4b67..e85ddcd763d 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -444,7 +444,7 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
 	err = -ENOENT;
 
 	read_lock(&ipip6_lock);
-	t = ipip6_tunnel_lookup(&init_net, iph->daddr, iph->saddr);
+	t = ipip6_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr);
 	if (t == NULL || t->parms.iph.daddr == 0)
 		goto out;
 
@@ -564,7 +564,7 @@ static int ipip6_rcv(struct sk_buff *skb)
 	iph = ip_hdr(skb);
 
 	read_lock(&ipip6_lock);
-	if ((tunnel = ipip6_tunnel_lookup(&init_net,
+	if ((tunnel = ipip6_tunnel_lookup(dev_net(skb->dev),
 					iph->saddr, iph->daddr)) != NULL) {
 		secpath_reset(skb);
 		skb->mac_header = skb->network_header;