---

yaml --- r: 90773 b: refs/heads/master c: fcee5ec h: refs/heads/master i: 90771: d426560 v: v3
git-mirror · Apr 16, 2008 · 6e39098 · 6e39098
1 parent 77eadda
commit 6e39098
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;