From d93cb80e16ece6f4960030a4b4793bde59329419 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 16 Apr 2008 01:05:03 -0700 Subject: [PATCH] --- yaml --- r: 90758 b: refs/heads/master c: cec3ffae1a019f02cd6b5fa291f279c8e9f86157 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipip.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 812e0b52ca64..d711b558f2be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9fae5c9138086d27715a8a0f29d5b55239db35c +refs/heads/master: cec3ffae1a019f02cd6b5fa291f279c8e9f86157 diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c index bc4d4cb89b01..da7147090a19 100644 --- a/trunk/net/ipv4/ipip.c +++ b/trunk/net/ipv4/ipip.c @@ -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);