---

yaml --- r: 254673 b: refs/heads/master c: c146066 h: refs/heads/master i: 254671: 0a1abd7 v: v3
git-mirror · Jul 2, 2011 · 167b4b4 · 167b4b4
1 parent 8cdf52e
commit 167b4b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12fdb4d3babcde43834c54dee22a69bb73adbae7
+refs/heads/master: c146066ab80267c3305de5dda6a4083f06df9265
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
@@ -828,7 +828,7 @@ static int __ip_append_data(struct sock *sk,
 	cork->length += length;
 	if (((length > mtu) || (skb && skb_is_gso(skb))) &&
 	    (sk->sk_protocol == IPPROTO_UDP) &&
-	    (rt->dst.dev->features & NETIF_F_UFO)) {
+	    (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len) {
 		err = ip_ufo_append_data(sk, queue, getfrag, from, length,
 					 hh_len, fragheaderlen, transhdrlen,
 					 mtu, flags);