diff options
| author |   Michael Marineau <marineam@gentoo.org> | 2007-08-23 23:47:35 +0000 |
|---|---|---|
| committer | Michael Marineau <marineam@gentoo.org> | 2007-08-23 23:47:35 +0000 |
| commit | 05e52f465a2a981bcd70673b5bf7c6ca4587ba04 (patch) | |
| tree | 9aeae948e9559a8ad34a935e3635b4b0d8e604b6 | |
| parent | Fix tarball name (diff) | |
| download | xen-05e52f465a2a981bcd70673b5bf7c6ca4587ba04.tar.gz xen-05e52f465a2a981bcd70673b5bf7c6ca4587ba04.tar.bz2 xen-05e52f465a2a981bcd70673b5bf7c6ca4587ba04.zip | |
remove a hunk is also in 2.6.18.2
svn path=/patches/; revision=22
| -rw-r--r-- | trunk/2.6.18/10001_xen-3.1.0.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/trunk/2.6.18/10001_xen-3.1.0.patch b/trunk/2.6.18/10001_xen-3.1.0.patch index 1684dea..be12463 100644 --- a/trunk/2.6.18/10001_xen-3.1.0.patch +++ b/trunk/2.6.18/10001_xen-3.1.0.patch @@ -105414,30 +105414,6 @@ diff -Nurp pristine-linux-2.6.18/net/core/skbuff.c tmp-linux-2.6-xen.patch/net/c C(pkt_type); C(ip_summed); C(priority); -@@ -1945,7 +1950,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 +1961,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; - diff -Nurp pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_tcp.c tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_tcp.c --- pristine-linux-2.6.18/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-09-19 20:42:06.000000000 -0700 +++ tmp-linux-2.6-xen.patch/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-06-14 10:41:41.000000000 -0700 |