Skip to content

Commit

Permalink
[SIT]: Use proper net in hash-lookup functions.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Apr 16, 2008
1 parent ca8def1 commit fcee5ec
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/ipv6/sit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit fcee5ec

Please sign in to comment.