netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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][GRE]: Use proper net in hash-lookup functions.
Date: Tue, 15 Apr 2008 16:55:27 +0400	[thread overview]
Message-ID: <4804A5BF.6010508@openvz.org> (raw)
In-Reply-To: <4804A374.9040505@openvz.org>

This is the part#2 of the patch #2 - get the proper net for
these functions. This change in a separate patch in order not
to get lost in a large previous patch.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---
 net/ipv4/ip_gre.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 6209ab3..1a17c5b 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -377,7 +377,7 @@ static void ipgre_err(struct sk_buff *skb, u32 info)
 	}
 
 	read_lock(&ipgre_lock);
-	t = ipgre_tunnel_lookup(&init_net, iph->daddr, iph->saddr,
+	t = ipgre_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr,
 			(flags&GRE_KEY) ?
 			*(((__be32*)p) + (grehlen>>2) - 1) : 0);
 	if (t == NULL || t->parms.iph.daddr == 0 ||
@@ -612,7 +612,7 @@ static int ipgre_rcv(struct sk_buff *skb)
 	}
 
 	read_lock(&ipgre_lock);
-	if ((tunnel = ipgre_tunnel_lookup(&init_net,
+	if ((tunnel = ipgre_tunnel_lookup(dev_net(skb->dev),
 					iph->saddr, iph->daddr, key)) != NULL) {
 		secpath_reset(skb);
 
-- 
1.5.3.4


  parent reply	other threads:[~2008-04-15 12:21 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-15 12:45 [PATCH net-2.6.26 0/8][GRE]: Make IPGRE tunnel work in net namespaces Pavel Emelyanov
2008-04-15 12:46 ` [PATCH net-2.6.26 1/8][GRE]: Introduce empty ipgre_net structure and net init/exit ops Pavel Emelyanov
2008-04-15 12:53 ` [PATCH net-2.6.26 2/8][GRE]: Add net/gre_net argument to some functions Pavel Emelyanov
2008-04-15 12:55 ` Pavel Emelyanov [this message]
2008-04-15 12:57 ` [PATCH net-2.6.26 4/8][GRE]: Make the fallback tunnel device per-net Pavel Emelyanov
2008-04-15 12:58 ` [PATCH net-2.6.26 5/8][GRE]: Make tunnels hashes per-net Pavel Emelyanov
2008-04-15 13:00 ` [PATCH net-2.6.26 6/8][GRE]: Use proper net in routing calls Pavel Emelyanov
2008-04-15 13:01 ` [PATCH net-2.6.26 7/8][GRE]: Allow to create IPGRE tunnels in net namespaces Pavel Emelyanov
2008-04-15 13:03 ` [PATCH net-2.6.26 8/8][GRE]: Allow for IPPROTO_GRE protocol in namespaces Pavel Emelyanov
2008-04-16  8:13   ` 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=4804A5BF.6010508@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).