[Xen-changelog] [linux-2.6.18-xen] Imported patch net-gso-6-linear-segmentation.patch from xen-unstable.hg 15200:bd3d6b4c52ec

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1180947924 -3600
# Node ID e1c18245a2f5a840b68e9a0344080deba1e92934
# Parent  69a9c3af24fc0ca4e0d0164d1fb86bbc0805c671
Imported patch net-gso-6-linear-segmentation.patch from xen-unstable.hg 
15200:bd3d6b4c52ec
---
 net/core/skbuff.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff -r 69a9c3af24fc -r e1c18245a2f5 net/core/skbuff.c
--- a/net/core/skbuff.c Mon Jun 04 10:05:23 2007 +0100
+++ b/net/core/skbuff.c Mon Jun 04 10:05:24 2007 +0100
@@ -1945,7 +1945,7 @@ struct sk_buff *skb_segment(struct sk_bu
        do {
                struct sk_buff *nskb;
                skb_frag_t *frag;
-               int hsize, nsize;
+               int hsize;
                int k;
                int size;
 
@@ -1956,11 +1956,10 @@ struct sk_buff *skb_segment(struct sk_bu
                hsize = skb_headlen(skb) - offset;
                if (hsize < 0)
                        hsize = 0;
-               nsize = hsize + doffset;
-               if (nsize > len + doffset || !sg)
-                       nsize = len + doffset;
-
-               nskb = alloc_skb(nsize + headroom, GFP_ATOMIC);
+               if (hsize > len || !sg)
+                       hsize = len;
+
+               nskb = alloc_skb(hsize + doffset + headroom, GFP_ATOMIC);
                if (unlikely(!nskb))
                        goto err;
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog