aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-16 04:22:43 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-16 04:22:43 -0400
commit8704ca7e916973c6583c0937e14b057d6c748651 (patch)
tree47b3fbfc75138e957ae2ad7a83cb272012f00f84 /net/ipv6/ip6_tunnel.c
parent2dd02c897d798c6a00dca46c7a50ebc10eb3be0d (diff)
[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>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index fad1af8ae1cf..72485a3ac9fd 100644
--- 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,
412 processing of the error. */ 412 processing of the error. */
413 413
414 read_lock(&ip6_tnl_lock); 414 read_lock(&ip6_tnl_lock);
415 if ((t = ip6_tnl_lookup(&init_net, &ipv6h->daddr, 415 if ((t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->daddr,
416 &ipv6h->saddr)) == NULL) 416 &ipv6h->saddr)) == NULL)
417 goto out; 417 goto out;
418 418
@@ -696,7 +696,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
696 696
697 read_lock(&ip6_tnl_lock); 697 read_lock(&ip6_tnl_lock);
698 698
699 if ((t = ip6_tnl_lookup(&init_net, &ipv6h->saddr, 699 if ((t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr,
700 &ipv6h->daddr)) != NULL) { 700 &ipv6h->daddr)) != NULL) {
701 if (t->parms.proto != ipproto && t->parms.proto != 0) { 701 if (t->parms.proto != ipproto && t->parms.proto != 0) {
702 read_unlock(&ip6_tnl_lock); 702 read_unlock(&ip6_tnl_lock);