]> err.no Git - linux-2.6/commitdiff
[SIT]: Use proper net in hash-lookup functions.
authorPavel Emelyanov <xemul@openvz.org>
Wed, 16 Apr 2008 08:15:59 +0000 (01:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Apr 2008 08:15:59 +0000 (01:15 -0700)
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>
net/ipv6/sit.c

index 66cf0be4b679e6124dc3c0e0ffca71e038d77fa8..e85ddcd763d08678057ae5bf14d97989c1452f70 100644 (file)
@@ -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;