From a1e92763d2d87585c3d8e66245e16add85d170b9 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 28 Mar 2009 23:39:18 -0700
Subject: [PATCH] --- yaml --- r: 139106 b: refs/heads/master c:
 2f181855a0b3c2b39314944add7b41c15647cf86 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae8bc4162833..fe367b95fd2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b21cd4eedff2123712c2132c8c6264d40332465
+refs/heads/master: 2f181855a0b3c2b39314944add7b41c15647cf86
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 6acbf9e79eb1..ce6356cd9f71 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -2579,7 +2579,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
 					  skb_network_header_len(skb));
 		skb_copy_from_linear_data(skb, nskb->data, doffset);
 
-		if (pos >= offset + len)
+		if (fskb != skb_shinfo(skb)->frag_list)
 			continue;
 
 		if (!sg) {