diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-03-22 20:54:52 +0300 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2017-03-22 20:54:52 +0300 |
| commit | 7c2b3e0ddc063f61a201ccb70a121fecc8373a49 (patch) | |
| tree | 6dfb348a27459cb2058124c1d8417680c194ed54 /net/ipv6/ip6_vti.c | |
| parent | 947b897204c417d22ad90e5f354858d78de15a07 (diff) | |
| parent | 916cda1aa1b412d7cf2991c3af7479544942d121 (diff) | |
| download | linux-7c2b3e0ddc063f61a201ccb70a121fecc8373a49.tar.xz | |
Merge remote-tracking branch 's390/guarded-storage' into kvms390/next
Diffstat (limited to 'net/ipv6/ip6_vti.c')
| -rw-r--r-- | net/ipv6/ip6_vti.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 644ba59fbd9d..3d8a3b63b4fd 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -485,11 +485,15 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) if (!skb->ignore_df && skb->len > mtu) { skb_dst(skb)->ops->update_pmtu(dst, NULL, skb, mtu); - if (skb->protocol == htons(ETH_P_IPV6)) + if (skb->protocol == htons(ETH_P_IPV6)) { + if (mtu < IPV6_MIN_MTU) + mtu = IPV6_MIN_MTU; + icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); - else + } else { icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu)); + } return -EMSGSIZE; } |