[kernel] r12089 - dists/sid/linux-2.6/debian/patches/bugfix/all

[Martin Michlmayr]

Author: tbm
Date: Sun Aug 17 13:07:53 2008
New Revision: 12089

Log:
less offset


Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/all/net-preserve-netfilter-attributes.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/net-preserve-netfilter-attributes.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/net-preserve-netfilter-attributes.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/net-preserve-netfilter-attributes.patch	Sun Aug 17 13:07:53 2008
@@ -15,10 +15,8 @@
 
 Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
 
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 8464017..ca1ccdf 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
+--- a/net/core/skbuff.c	2008-08-17 13:07:00.000000000 +0000
++++ b/net/core/skbuff.c	2008-08-17 13:07:06.000000000 +0000
 @@ -2284,13 +2284,7 @@
  			segs = nskb;
  		tail = nskb;
@@ -34,7 +32,7 @@
  		nskb->mac_len = skb->mac_len;
  
  		skb_reserve(nskb, headroom);
-@@ -2274,6 +2267,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
+@@ -2301,6 +2295,7 @@
  		skb_copy_from_linear_data(skb, skb_put(nskb, doffset),
  					  doffset);
  		if (!sg) {
@@ -42,7 +40,7 @@
  			nskb->csum = skb_copy_and_csum_bits(skb, offset,
  							    skb_put(nskb, len),
  							    len, 0);
-@@ -2283,8 +2277,6 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
+@@ -2310,8 +2305,6 @@
  		frag = skb_shinfo(nskb)->frags;
  		k = 0;