From: Pavel Emelyanov <xemul@openvz.org>
To: David Miller <davem@davemloft.net>
Cc: Linux Netdev List <netdev@vger.kernel.org>
Subject: [PATCH net-2.6.26 4/8][IPIP]: Use proper net in hash-lookup functions.
Date: Tue, 15 Apr 2008 16:33:45 +0400 [thread overview]
Message-ID: <4804A0A9.8090106@openvz.org> (raw)
In-Reply-To: <48049E9C.1020207@openvz.org>
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: Pavel Emelyanov <xemul@openvz.org>
---
net/ipv4/ipip.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index bc4d4cb..da71470 100644
--- a/net/ipv4/ipip.c
+++ b/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);
--
1.5.3.4
next prev parent reply other threads:[~2008-04-15 11:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-15 12:25 [PATCH net-2.6.26 0/8][IPIP]: Make IPIP tunnel work in net namespaces Pavel Emelyanov
2008-04-15 12:26 ` [PATCH net-2.6.26 1/8][IPIP]: Introduce empty ipip_net structure and net init/exit ops Pavel Emelyanov
2008-04-15 12:29 ` [PATCH net-2.6.26 2/8][IPIP]: Make the fallback tunnel device per-net Pavel Emelyanov
2008-04-15 12:31 ` [PATCH net-2.6.26 3/8][IPIP]: Add net/ipip_net argument to some functions Pavel Emelyanov
2008-04-15 12:33 ` Pavel Emelyanov [this message]
2008-04-15 12:36 ` [PATCH net-2.6.26 5/8][IPIP]: Make tunnels hashes per net Pavel Emelyanov
2008-04-15 12:38 ` [PATCH net-2.6.26 6/8][IPIP]: Use proper net in (mostly) routing calls Pavel Emelyanov
2008-04-15 12:39 ` [PATCH net-2.6.26 7/8][IPIP]: Allow to create IPIP tunnels in net namespaces Pavel Emelyanov
2008-04-15 12:41 ` [PATCH net-2.6.26 8/8][IPIP]: Allow for IPPROTO_IPIP protocol in namespaces Pavel Emelyanov
2008-04-16 8:08 ` [PATCH net-2.6.26 0/8][IPIP]: Make IPIP tunnel work in net namespaces David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4804A0A9.8090106@openvz.org \
--to=xemul@openvz.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.