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

Commit 77d4015b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ufo_fixes' 



Jiri Pirko says:

====================
UFO fixes

Couple of patches fixing UFO functionality in different situations.

v1->v2:
- minor if{}else{} coding style adjustment suggested by Sergei Shtylyov
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f2e5ddcc e93b7d74

net/ipv4/ip_output.c

+9 −4
Original line number Diff line number Diff line
@@ -772,15 +772,20 @@ static inline int ip_ufo_append_data(struct sock *sk, 
		/* initialize protocol header pointer */

		skb->transport_header = skb->network_header + fragheaderlen;



		skb->ip_summed = CHECKSUM_PARTIAL;

		skb->csum = 0;





		__skb_queue_tail(queue, skb);

	} else if (skb_is_gso(skb)) {

		goto append;

	}



	skb->ip_summed = CHECKSUM_PARTIAL;

	/* specify the length of each IP datagram fragment */

	skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen;

	skb_shinfo(skb)->gso_type = SKB_GSO_UDP;

		__skb_queue_tail(queue, skb);

	}



append:

	return skb_append_datato_frags(sk, skb, getfrag, from,

				       (length - transhdrlen));

}

net/ipv6/ip6_output.c

+14 −11
Original line number Diff line number Diff line
@@ -1008,6 +1008,7 @@ static inline int ip6_ufo_append_data(struct sock *sk, 


{

	struct sk_buff *skb;

	struct frag_hdr fhdr;

	int err;



	/* There is support for UDP large send offload by network
@@ -1015,8 +1016,6 @@ static inline int ip6_ufo_append_data(struct sock *sk, 
	 * udp datagram

	 */

	if ((skb = skb_peek_tail(&sk->sk_write_queue)) == NULL) {

		struct frag_hdr fhdr;



		skb = sock_alloc_send_skb(sk,

			hh_len + fragheaderlen + transhdrlen + 20,

			(flags & MSG_DONTWAIT), &err);
@@ -1036,9 +1035,14 @@ static inline int ip6_ufo_append_data(struct sock *sk, 
		skb->transport_header = skb->network_header + fragheaderlen;



		skb->protocol = htons(ETH_P_IPV6);

		skb->ip_summed = CHECKSUM_PARTIAL;

		skb->csum = 0;



		__skb_queue_tail(&sk->sk_write_queue, skb);

	} else if (skb_is_gso(skb)) {

		goto append;

	}



	skb->ip_summed = CHECKSUM_PARTIAL;

	/* Specify the length of each IPv6 datagram fragment.

	 * It has to be a multiple of 8.

	 */
@@ -1047,9 +1051,8 @@ static inline int ip6_ufo_append_data(struct sock *sk, 
	skb_shinfo(skb)->gso_type = SKB_GSO_UDP;

	ipv6_select_ident(&fhdr, rt);

	skb_shinfo(skb)->ip6_frag_id = fhdr.identification;

		__skb_queue_tail(&sk->sk_write_queue, skb);

	}



append:

	return skb_append_datato_frags(sk, skb, getfrag, from,

				       (length - transhdrlen));

}

net/ipv6/udp.c

+2 −3
Original line number Diff line number Diff line
@@ -1225,9 +1225,6 @@ do_udp_sendmsg: 
	if (tclass < 0)

		tclass = np->tclass;



	if (dontfrag < 0)

		dontfrag = np->dontfrag;



	if (msg->msg_flags&MSG_CONFIRM)

		goto do_confirm;

back_from_confirm:
@@ -1246,6 +1243,8 @@ back_from_confirm: 
	up->pending = AF_INET6;



do_append_data:

	if (dontfrag < 0)

		dontfrag = np->dontfrag;

	up->len += ulen;

	getfrag  =  is_udplite ?  udplite_getfrag : ip_generic_getfrag;

	err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen,