Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[IPIP]: Use proper net in hash-lookup functions. 



This is the part#2 of the previous patch - get the proper
net for these functions.

I make it in a separate patch, so that this change does not
get lost in a large previous patch.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9fae5c9

net/ipv4/ipip.c

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int ipip_err(struct sk_buff *skb, u32 info) 
	err = -ENOENT;



	read_lock(&ipip_lock);

	t = ipip_tunnel_lookup(&init_net, iph->daddr, iph->saddr);

	t = ipip_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr);

	if (t == NULL || t->parms.iph.daddr == 0)

		goto out;
@@ -478,7 +478,7 @@ static int ipip_rcv(struct sk_buff *skb) 
	const struct iphdr *iph = ip_hdr(skb);



	read_lock(&ipip_lock);

	if ((tunnel = ipip_tunnel_lookup(&init_net,

	if ((tunnel = ipip_tunnel_lookup(dev_net(skb->dev),

					iph->saddr, iph->daddr)) != NULL) {

		if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {

			read_unlock(&ipip_lock);