|
@@ -444,7 +444,7 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
|
|
err = -ENOENT;
|
|
err = -ENOENT;
|
|
|
|
|
|
read_lock(&ipip6_lock);
|
|
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)
|
|
if (t == NULL || t->parms.iph.daddr == 0)
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
@@ -564,7 +564,7 @@ static int ipip6_rcv(struct sk_buff *skb)
|
|
iph = ip_hdr(skb);
|
|
iph = ip_hdr(skb);
|
|
|
|
|
|
read_lock(&ipip6_lock);
|
|
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) {
|
|
iph->saddr, iph->daddr)) != NULL) {
|
|
secpath_reset(skb);
|
|
secpath_reset(skb);
|
|
skb->mac_header = skb->network_header;
|
|
skb->mac_header = skb->network_header;
|