diff --git a/linux-2.6-xen-sparse/net/core/skbuff.c b/linux-2.6-xen-sparse/net/core/skbuff.c
index 064e6277b1..5a524946b0 100644
--- a/linux-2.6-xen-sparse/net/core/skbuff.c
+++ b/linux-2.6-xen-sparse/net/core/skbuff.c
@@ -1875,7 +1875,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
 	do {
 		struct sk_buff *nskb;
 		skb_frag_t *frag;
-		int hsize, nsize;
+		int hsize;
 		int k;
 		int size;
 
@@ -1886,11 +1886,10 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
 		hsize = skb_headlen(skb) - offset;
 		if (hsize < 0)
 			hsize = 0;
-		nsize = hsize + doffset;
-		if (nsize > len + doffset || !sg)
-			nsize = len + doffset;
+		if (hsize > len || !sg)
+			hsize = len;
 
-		nskb = alloc_skb(nsize + headroom, GFP_ATOMIC);
+		nskb = alloc_skb(hsize + doffset + headroom, GFP_ATOMIC);
 		if (unlikely(!nskb))
 			goto err;
 
diff --git a/patches/linux-2.6.16.33/net-gso-6-linear-segmentation.patch b/patches/linux-2.6.16.33/net-gso-6-linear-segmentation.patch
new file mode 100644
index 0000000000..5e615a14a7
--- /dev/null
+++ b/patches/linux-2.6.16.33/net-gso-6-linear-segmentation.patch
@@ -0,0 +1,26 @@
+diff -Naru a/net/core/skbuff.c b/net/core/skbuff.c
+--- a/net/core/skbuff.c	2006-12-14 09:32:04 -08:00
++++ b/net/core/skbuff.c	2006-12-14 09:32:04 -08:00
+@@ -1946,7 +1946,7 @@
+ 	do {
+ 		struct sk_buff *nskb;
+ 		skb_frag_t *frag;
+-		int hsize, nsize;
++		int hsize;
+ 		int k;
+ 		int size;
+ 
+@@ -1957,11 +1957,10 @@
+ 		hsize = skb_headlen(skb) - offset;
+ 		if (hsize < 0)
+ 			hsize = 0;
+-		nsize = hsize + doffset;
+-		if (nsize > len + doffset || !sg)
+-			nsize = len + doffset;
++		if (hsize > len || !sg)
++			hsize = len;
+ 
+-		nskb = alloc_skb(nsize + headroom, GFP_ATOMIC);
++		nskb = alloc_skb(hsize + doffset + headroom, GFP_ATOMIC);
+ 		if (unlikely(!nskb))
+ 			goto err;
diff --git a/patches/linux-2.6.16.33/series b/patches/linux-2.6.16.33/series
index 28fabf00ff..8410fb3bde 100644
--- a/patches/linux-2.6.16.33/series
+++ b/patches/linux-2.6.16.33/series
@@ -17,6 +17,7 @@ net-gso-2-checksum-fix.patch
 net-gso-3-fix-errorcheck.patch
 net-gso-4-kill-warnon.patch
 net-gso-5-rcv-mss.patch
+net-gso-6-linear-segmentation.patch
 pci-mmconfig-fix-from-2.6.17.patch
 pmd-shared.patch
 rcu_needs_cpu.patch