1 files changed, 2 insertions, 1 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 91fb4e8212f5..5e31a909a2b0 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -125,7 +125,8 @@ static int ip6_finish_output2(struct sk_buff *skb)
 static int ip6_finish_output(struct sk_buff *skb)
 {
         if ((skb->len > ip6_skb_dst_mtu(skb) && !skb_is_gso(skb)) ||
-            dst_allfrag(skb_dst(skb)))
+            dst_allfrag(skb_dst(skb)) ||
+            (IP6CB(skb)->frag_max_size && skb->len > IP6CB(skb)->frag_max_size))
                 return ip6_fragment(skb, ip6_finish_output2);
         else
                 return ip6_finish_output2(skb);