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

Calls to ip6_tnl_lookup were stubbed with init_net - give them
a proper one.

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

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index fad1af8ae1cf0af79c4514f9b5cd82ff9e81a128..72485a3ac9fd03406671e2b2dba2aa6b58a13e19 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -412,7 +412,7 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
           processing of the error. */
 
        read_lock(&ip6_tnl_lock);
-       if ((t = ip6_tnl_lookup(&init_net, &ipv6h->daddr,
+       if ((t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->daddr,
                                        &ipv6h->saddr)) == NULL)
                goto out;
 
@@ -696,7 +696,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
 
        read_lock(&ip6_tnl_lock);
 
-       if ((t = ip6_tnl_lookup(&init_net, &ipv6h->saddr,
+       if ((t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr,
                                        &ipv6h->daddr)) != NULL) {
                if (t->parms.proto != ipproto && t->parms.proto != 0) {
                        read_unlock(&ip6_tnl_lock);