aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv6/ip6_output.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 4cfdad4e8356..5a5b7d4ad31c 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -567,6 +567,19 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
567 nexthdr = *prevhdr; 567 nexthdr = *prevhdr;
568 568
569 mtu = dst_mtu(&rt->u.dst); 569 mtu = dst_mtu(&rt->u.dst);
570
571 /* We must not fragment if the socket is set to force MTU discovery
572 * or if the skb it not generated by a local socket. (This last
573 * check should be redundant, but it's free.)
574 */
575 if (!np || np->pmtudisc >= IPV6_PMTUDISC_DO) {
576 skb->dev = skb->dst->dev;
577 icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, skb->dev);
578 IP6_INC_STATS(ip6_dst_idev(skb->dst), IPSTATS_MIB_FRAGFAILS);
579 kfree_skb(skb);
580 return -EMSGSIZE;
581 }
582
570 if (np && np->frag_size < mtu) { 583 if (np && np->frag_size < mtu) {
571 if (np->frag_size) 584 if (np->frag_size)
572 mtu = np->frag_size; 585 mtu = np->frag_size;