diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 0c6403cf8b52..ade1390c6348 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -627,7 +627,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
627 | rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL, | 627 | rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL, |
628 | eiph->daddr, eiph->saddr, 0, 0, | 628 | eiph->daddr, eiph->saddr, 0, 0, |
629 | IPPROTO_IPIP, RT_TOS(eiph->tos), 0); | 629 | IPPROTO_IPIP, RT_TOS(eiph->tos), 0); |
630 | if (IS_ERR(rt) || rt->dst.dev->type != ARPHRD_TUNNEL) { | 630 | if (IS_ERR(rt) || rt->dst.dev->type != ARPHRD_TUNNEL6) { |
631 | if (!IS_ERR(rt)) | 631 | if (!IS_ERR(rt)) |
632 | ip_rt_put(rt); | 632 | ip_rt_put(rt); |
633 | goto out; | 633 | goto out; |
@@ -636,7 +636,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
636 | } else { | 636 | } else { |
637 | if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos, | 637 | if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos, |
638 | skb2->dev) || | 638 | skb2->dev) || |
639 | skb_dst(skb2)->dev->type != ARPHRD_TUNNEL) | 639 | skb_dst(skb2)->dev->type != ARPHRD_TUNNEL6) |
640 | goto out; | 640 | goto out; |
641 | } | 641 | } |
642 | 642 | ||