X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fipv4%2Faf_inet.c;h=19ab78aca547fc7fb45e56607e7adafd0036d947;hb=084c6c5013af3c62f1c344435214496f5ac999f2;hp=ecd2c3f245ce2b2e0b79f17417c5e6ad8c70abf6;hpb=9d4cb8e3a5b448d802155688bf2d50ac1b9e1a51;p=~andy%2Flinux

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index ecd2c3f245c..19ab78aca54 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1296,8 +1296,11 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
 
 	segs = ERR_PTR(-EPROTONOSUPPORT);
 
-	/* Note : following gso_segment() might change skb->encapsulation */
-	udpfrag = !skb->encapsulation && proto == IPPROTO_UDP;
+	if (skb->encapsulation &&
+	    skb_shinfo(skb)->gso_type & (SKB_GSO_SIT|SKB_GSO_IPIP))
+		udpfrag = proto == IPPROTO_UDP && encap;
+	else
+		udpfrag = proto == IPPROTO_UDP && !skb->encapsulation;
 
 	ops = rcu_dereference(inet_offloads[proto]);
 	if (likely(ops && ops->callbacks.gso_segment))