diff options
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 61d10659729..db328466796 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -609,10 +609,10 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
609 | if (rel_info > dst_mtu(skb_dst(skb2))) | 609 | if (rel_info > dst_mtu(skb_dst(skb2))) |
610 | goto out; | 610 | goto out; |
611 | 611 | ||
612 | skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), rel_info); | 612 | skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), NULL, skb2, rel_info); |
613 | } | 613 | } |
614 | if (rel_type == ICMP_REDIRECT) | 614 | if (rel_type == ICMP_REDIRECT) |
615 | skb_dst(skb2)->ops->redirect(skb_dst(skb2), skb2); | 615 | skb_dst(skb2)->ops->redirect(skb_dst(skb2), NULL, skb2); |
616 | 616 | ||
617 | icmp_send(skb2, rel_type, rel_code, htonl(rel_info)); | 617 | icmp_send(skb2, rel_type, rel_code, htonl(rel_info)); |
618 | 618 | ||
@@ -952,7 +952,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb, | |||
952 | if (mtu < IPV6_MIN_MTU) | 952 | if (mtu < IPV6_MIN_MTU) |
953 | mtu = IPV6_MIN_MTU; | 953 | mtu = IPV6_MIN_MTU; |
954 | if (skb_dst(skb)) | 954 | if (skb_dst(skb)) |
955 | skb_dst(skb)->ops->update_pmtu(skb_dst(skb), mtu); | 955 | skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu); |
956 | if (skb->len > mtu) { | 956 | if (skb->len > mtu) { |
957 | *pmtu = mtu; | 957 | *pmtu = mtu; |
958 | err = -EMSGSIZE; | 958 | err = -EMSGSIZE; |