diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-16 10:15:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 10:15:59 +0200 |
| commit | fcee5ec9fdd2b27bce2a6ae8cd8161ad9a8899df (patch) | |
| tree | a695c1e5499e222107d9bbd97d00656b21bcb91b /net/ipv6 | |
| parent | [SIT]: Add net/sit_net argument to some functions. (diff) | |
| download | linux-fcee5ec9fdd2b27bce2a6ae8cd8161ad9a8899df.tar.xz linux-fcee5ec9fdd2b27bce2a6ae8cd8161ad9a8899df.zip | |
[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')
| -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) 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; |