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

Commit 89f7d291 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "udp: consistently apply ufo or fragmentation"

parents a9cc4dab 203b1e4d

net/ipv4/ip_output.c

+6 −3
Original line number Diff line number Diff line
@@ -922,10 +922,12 @@ static int __ip_append_data(struct sock *sk, 
		csummode = CHECKSUM_PARTIAL;



	cork->length += length;

	if (((length > mtu) || (skb && skb_is_gso(skb))) &&

	if ((skb && skb_is_gso(skb)) ||

	    (((length + (skb ? skb->len : fragheaderlen)) > mtu) &&

	    (skb_queue_len(queue) <= 1) &&

	    (sk->sk_protocol == IPPROTO_UDP) &&

	    (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&

	    (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) {

	    (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) &&

	    (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx)) {

		err = ip_ufo_append_data(sk, queue, getfrag, from, length,

					 hh_len, fragheaderlen, transhdrlen,

					 maxfraglen, flags);
@@ -1241,6 +1243,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, 
		return -EINVAL;



	if ((size + skb->len > mtu) &&

	    (skb_queue_len(&sk->sk_write_queue) == 1) &&

	    (sk->sk_protocol == IPPROTO_UDP) &&

	    (rt->dst.dev->features & NETIF_F_UFO)) {

		if (skb->ip_summed != CHECKSUM_PARTIAL)

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4) 
	if (is_udplite)  				 /*     UDP-Lite      */

		csum = udplite_csum(skb);



	else if (sk->sk_no_check_tx) {   /* UDP csum disabled */

	else if (sk->sk_no_check_tx && !skb_is_gso(skb)) {   /* UDP csum off */



		skb->ip_summed = CHECKSUM_NONE;

		goto send;

net/ipv6/ip6_output.c

+5 −4
Original line number Diff line number Diff line
@@ -1362,11 +1362,12 @@ emsgsize: 
	 */



	cork->length += length;

	if (((length > mtu) ||

	     (skb && skb_is_gso(skb))) &&

	if ((skb && skb_is_gso(skb)) ||

	    (((length + (skb ? skb->len : headersize)) > mtu) &&

	    (skb_queue_len(queue) <= 1) &&

	    (sk->sk_protocol == IPPROTO_UDP) &&

	    (rt->dst.dev->features & NETIF_F_UFO) &&

	    (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk)) {

	    (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) &&

	    (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk))) {

		err = ip6_ufo_append_data(sk, queue, getfrag, from, length,

					  hh_len, fragheaderlen, exthdrlen,

					  transhdrlen, mtu, flags, fl6);