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

[Martin Michlmayr]

Author: tbm
Date: Sun Aug 17 13:06:36 2008
New Revision: 12088

Log:
make it apply to 2.6.26


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:06:36 2008
@@ -19,7 +19,7 @@
 index 8464017..ca1ccdf 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -2256,14 +2256,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
+@@ -2284,13 +2284,7 @@
  			segs = nskb;
  		tail = nskb;
  
@@ -27,7 +27,6 @@
 -		skb_copy_queue_mapping(nskb, skb);
 -		nskb->priority = skb->priority;
 -		nskb->protocol = skb->protocol;
--		nskb->vlan_tci = skb->vlan_tci;
 -		nskb->dst = dst_clone(skb->dst);
 -		memcpy(nskb->cb, skb->cb, sizeof(skb->cb));
 -		nskb->pkt_type = skb->pkt_type;