mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
Christian Limpach
54a1273470
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com> --HG-- rename : linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_pre.h => linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch.h rename : patches/linux-2.6.17/blktap-aio-16_03_06.patch => patches/linux-2.6.18/blktap-aio-16_03_06.patch rename : patches/linux-2.6.17/fix-ide-cd-pio-mode.patch => patches/linux-2.6.18/fix-ide-cd-pio-mode.patch rename : patches/linux-2.6.17/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch => patches/linux-2.6.18/git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch rename : patches/linux-2.6.17/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch => patches/linux-2.6.18/git-4bfaaef01a1badb9e8ffb0c0a37cd2379008d21f.patch rename : patches/linux-2.6.17/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch => patches/linux-2.6.18/git-dbaab49f92ff6ae6255762a948375e4036cbdbd2.patch rename : patches/linux-2.6.17/i386-mach-io-check-nmi.patch => patches/linux-2.6.18/i386-mach-io-check-nmi.patch rename : patches/linux-2.6.17/ipv6-no-autoconf.patch => patches/linux-2.6.18/ipv6-no-autoconf.patch rename : patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch => patches/linux-2.6.18/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch rename : patches/linux-2.6.17/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch => patches/linux-2.6.18/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch rename : patches/linux-2.6.17/net-csum.patch => patches/linux-2.6.18/net-csum.patch rename : patches/linux-2.6.17/net-gso-5-rcv-mss.patch => patches/linux-2.6.18/net-gso-5-rcv-mss.patch rename : patches/linux-2.6.17/net-gso-6-linear-segmentation.patch => patches/linux-2.6.18/net-gso-6-linear-segmentation.patch rename : patches/linux-2.6.17/pmd-shared.patch => patches/linux-2.6.18/pmd-shared.patch rename : patches/linux-2.6.17/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch => patches/linux-2.6.18/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch rename : patches/linux-2.6.17/series => patches/linux-2.6.18/series rename : patches/linux-2.6.17/x86-elfnote-as-preprocessor-macro.patch => patches/linux-2.6.18/x86-elfnote-as-preprocessor-macro.patch rename : patches/linux-2.6.17/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.18/x86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch rename : patches/linux-2.6.17/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch => patches/linux-2.6.18/x86_64-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch rename : patches/linux-2.6.17/xen-hotplug.patch => patches/linux-2.6.18/xen-hotplug.patch rename : patches/linux-2.6.17/xenoprof-generic.patch => patches/linux-2.6.18/xenoprof-generic.patch
28 lines
811 B
Diff
28 lines
811 B
Diff
diff -pruN ../orig-linux-2.6.18/net/core/skbuff.c ./net/core/skbuff.c
|
|
--- ../orig-linux-2.6.18/net/core/skbuff.c 2006-09-20 04:42:06.000000000 +0100
|
|
+++ ./net/core/skbuff.c 2007-01-12 18:10:37.000000000 +0000
|
|
@@ -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;
|
|
+ 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;
|
|
|