From 167b4b45f9c5a7029cdead3306bf83dc7d90ced5 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 29 Jun 2011 23:19:32 +0000
Subject: [PATCH] --- yaml --- r: 254673 b: refs/heads/master c:
 c146066ab80267c3305de5dda6a4083f06df9265 h: refs/heads/master i:   254671:
 0a1abd700731e432a0ad84fe6357f186f5a8162c v: v3

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

diff --git a/[refs] b/[refs]
index 60d43704702c..dce0eb7cf8b5 100644
--- 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
index 4a7e16b5d3f3..84f26e8e6c60 100644
--- 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);