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 3/8][SIT]: Use proper net in hash-lookup functions.
Date: Tue, 15 Apr 2008 17:31:36 +0400 [thread overview]
Message-ID: <4804AE38.1090808@openvz.org> (raw)
In-Reply-To: <4804ACFA.1040003@openvz.org>
Replace introduced in the previous patch init_net stubs
with the proper net pointer.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
net/ipv6/sit.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 66cf0be..e85ddcd 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -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;
--
1.5.3.4
next prev parent reply other threads:[~2008-04-15 12:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-15 13:26 [PATCH net-2.6.26 0/8][SIT]: Make SIT tunnel work in net namespaces Pavel Emelyanov
2008-04-15 13:27 ` [PATCH net-2.6.26 1/8][SIT]: Introduce empty struct sit_net and init/exit net ops Pavel Emelyanov
2008-04-15 13:29 ` [PATCH net-2.6.26 2/8][SIT]: Add net/sit_net argument to some functions Pavel Emelyanov
2008-04-15 13:31 ` Pavel Emelyanov [this message]
2008-04-15 13:33 ` [PATCH net-2.6.26 4/8][SIT]: Make the fallback tunnel device per-net Pavel Emelyanov
2008-04-15 13:34 ` [PATCH net-2.6.26 5/8][SIT]: Make tunnels hashes per-net Pavel Emelyanov
2008-04-15 13:36 ` [PATCH net-2.6.26 6/8][SIT]: Use proper net in routing calls Pavel Emelyanov
2008-04-15 13:37 ` [PATCH net-2.6.26 7/8][SIT]: Allow to create SIT tunnels in net namespaces Pavel Emelyanov
2008-04-15 13:39 ` [PATCH net-2.6.26 8/8][SIT]: Allow for IPPROTO_IPV6 protocol in namespaces Pavel Emelyanov
2008-04-16 8:19 ` [PATCH net-2.6.26 0/8][SIT]: Make SIT 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=4804AE38.1090808@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.