diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-16 04:15:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-16 04:15:59 -0400 |
commit | fcee5ec9fdd2b27bce2a6ae8cd8161ad9a8899df (patch) | |
tree | a695c1e5499e222107d9bbd97d00656b21bcb91b /net/ipv6/sit.c | |
parent | ca8def1483a7621503247e28d1ca5dace9b945fe (diff) |
[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>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 66cf0be4b679..e85ddcd763d0 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) | |||
444 | err = -ENOENT; | 444 | err = -ENOENT; |
445 | 445 | ||
446 | read_lock(&ipip6_lock); | 446 | read_lock(&ipip6_lock); |
447 | t = ipip6_tunnel_lookup(&init_net, iph->daddr, iph->saddr); | 447 | t = ipip6_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr); |
448 | if (t == NULL || t->parms.iph.daddr == 0) | 448 | if (t == NULL || t->parms.iph.daddr == 0) |
449 | goto out; | 449 | goto out; |
450 | 450 | ||
@@ -564,7 +564,7 @@ static int ipip6_rcv(struct sk_buff *skb) | |||
564 | iph = ip_hdr(skb); | 564 | iph = ip_hdr(skb); |
565 | 565 | ||
566 | read_lock(&ipip6_lock); | 566 | read_lock(&ipip6_lock); |
567 | if ((tunnel = ipip6_tunnel_lookup(&init_net, | 567 | if ((tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), |
568 | iph->saddr, iph->daddr)) != NULL) { | 568 | iph->saddr, iph->daddr)) != NULL) { |
569 | secpath_reset(skb); | 569 | secpath_reset(skb); |
570 | skb->mac_header = skb->network_header; | 570 | skb->mac_header = skb->network_header; |