From fbb7edee2dab96bcc0235859082d9b29a27be53c Mon Sep 17 00:00:00 2001
From: Kostya B <bkostya@hotmail.com>
Date: Tue, 29 Apr 2008 22:36:30 -0700
Subject: [PATCH] --- yaml --- r: 95399 b: refs/heads/master c:
 be9164e769d57aa10b2bbe15d103edc041b9e7de h: refs/heads/master i:   95397:
 50ba283b32ede7efc6312b010621e64444ed56db   95395:
 eeedc6916d42524461a9e27ad1566b86e3c2969b   95391:
 8b247b5051f3d48084be3f7f6ea02483e643bebe v: v3

---
 [refs]                     |  2 +-
 trunk/net/ipv4/ip_output.c | 22 +++++++---------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 44c4379a03ad..06c78f1ea1bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a8209d19dd791aaac3668be2fa51a9b42113efd
+refs/heads/master: be9164e769d57aa10b2bbe15d103edc041b9e7de
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index 08349267ceb4..e527628f56cf 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -753,23 +753,15 @@ static inline int ip_ufo_append_data(struct sock *sk,
 		skb->ip_summed = CHECKSUM_PARTIAL;
 		skb->csum = 0;
 		sk->sk_sndmsg_off = 0;
-	}
 
-	err = skb_append_datato_frags(sk,skb, getfrag, from,
-			       (length - transhdrlen));
-	if (!err) {
-		/* specify the length of each IP datagram fragment*/
+		/* specify the length of each IP datagram fragment */
 		skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
 		skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
 		__skb_queue_tail(&sk->sk_write_queue, skb);
-
-		return 0;
 	}
-	/* There is not enough support do UFO ,
-	 * so follow normal path
-	 */
-	kfree_skb(skb);
-	return err;
+
+	return skb_append_datato_frags(sk, skb, getfrag, from,
+				       (length - transhdrlen));
 }
 
 /*
@@ -863,9 +855,9 @@ int ip_append_data(struct sock *sk,
 		csummode = CHECKSUM_PARTIAL;
 
 	inet->cork.length += length;
-	if (((length > mtu) && (sk->sk_protocol == IPPROTO_UDP)) &&
-			(rt->u.dst.dev->features & NETIF_F_UFO)) {
-
+	if (((length> mtu) || !skb_queue_empty(&sk->sk_write_queue)) &&
+	    (sk->sk_protocol == IPPROTO_UDP) &&
+	    (rt->u.dst.dev->features & NETIF_F_UFO)) {
 		err = ip_ufo_append_data(sk, getfrag, from, length, hh_len,
 					 fragheaderlen, transhdrlen, mtu,
 					 flags);