From 6e39098eab4b93a50d4aa3c628d51fa8cb8b0cd7 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 16 Apr 2008 01:15:59 -0700 Subject: [PATCH] --- yaml --- r: 90773 b: refs/heads/master c: fcee5ec9fdd2b27bce2a6ae8cd8161ad9a8899df h: refs/heads/master i: 90771: d42656029561cd2d0d37edf7e6fa8c30ec802978 v: v3 --- [refs] | 2 +- trunk/net/ipv6/sit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 88703eb00f9c..efd8b9266067 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca8def1483a7621503247e28d1ca5dace9b945fe +refs/heads/master: fcee5ec9fdd2b27bce2a6ae8cd8161ad9a8899df diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c index 66cf0be4b679..e85ddcd763d0 100644 --- a/trunk/net/ipv6/sit.c +++ b/trunk/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;