summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-16 01:09:44 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-16 01:09:44 -0700
commit3b4667f3db4d7d0b6d8f35c2ca80333ea141629a (patch)
tree2224c61f148a25721753af6c526150668f040d5d /net/ipv4
parentf57e7d5a7bd2a600a8a97e278e4c46904ceacf51 (diff)
downloadop-kernel-dev-3b4667f3db4d7d0b6d8f35c2ca80333ea141629a.zip
op-kernel-dev-3b4667f3db4d7d0b6d8f35c2ca80333ea141629a.tar.gz
[GRE]: Use proper net in hash-lookup functions.
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_gre.c4
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);
OpenPOWER on IntegriCloud