Commit fcee5ec9 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca8def14

net/ipv6/sit.c

+2 −2
Original line number Diff line number Diff line
@@ -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;