ia64/xen-unstable

view patches/linux-2.6.18/net-gso-6-linear-segmentation.patch @ 14445:cb1693873a7e

libxc: Explicitly reserve space for special pages in HVM memmap.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Fri Mar 16 18:59:28 2007 +0000 (2007-03-16)
parents 3adf00179a63
children
line source
1 diff -pruN ../orig-linux-2.6.18/net/core/skbuff.c ./net/core/skbuff.c
2 --- ../orig-linux-2.6.18/net/core/skbuff.c 2006-09-20 04:42:06.000000000 +0100
3 +++ ./net/core/skbuff.c 2007-01-12 18:10:37.000000000 +0000
4 @@ -1945,7 +1945,7 @@ struct sk_buff *skb_segment(struct sk_bu
5 do {
6 struct sk_buff *nskb;
7 skb_frag_t *frag;
8 - int hsize, nsize;
9 + int hsize;
10 int k;
11 int size;
13 @@ -1956,11 +1956,10 @@ struct sk_buff *skb_segment(struct sk_bu
14 hsize = skb_headlen(skb) - offset;
15 if (hsize < 0)
16 hsize = 0;
17 - nsize = hsize + doffset;
18 - if (nsize > len + doffset || !sg)
19 - nsize = len + doffset;
20 + if (hsize > len || !sg)
21 + hsize = len;
23 - nskb = alloc_skb(nsize + headroom, GFP_ATOMIC);
24 + nskb = alloc_skb(hsize + doffset + headroom, GFP_ATOMIC);
25 if (unlikely(!nskb))
26 goto err;