Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9037c357 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

ip6_output: fragment outgoing reassembled skb properly 



If reassembled packet would fit into outdev MTU, it is not fragmented
according the original frag size and it is send as single big packet.

The second case is if skb is gso. In that case fragmentation does not happen
according to the original frag size.

This patch fixes these.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e3faf88

net/ipv6/ip6_output.c

+2 −1
Original line number Diff line number Diff line
@@ -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);