[packages/kernel/LINUX_3_10] - fix patching skbuff.h

[baggins]

commit 793784ccd750d52df89a39513a6ae7976f289cbc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 27 18:34:12 2013 +0100

    - fix patching skbuff.h
    
    Due to changes introduced in 3.10.23, the patch mismatched and changed
    nf_copy instead of __nf_copy, which caused __copy_skb_header in
    net/core/skbuff.c to not copy IMQ fields in skbuf struct.

 kernel-imq.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/kernel-imq.patch b/kernel-imq.patch
index 8804a3b..07d11f0 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1273,8 +1273,8 @@ index dec1748..1f17280 100644
  	unsigned long		_skb_refdst;
  #ifdef CONFIG_XFRM
 @@ -458,6 +464,9 @@ struct sk_buff {
- #ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
- 	struct sk_buff		*nfct_reasm;
+ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+ 	struct nf_conntrack	*nfct;
  #endif
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +	struct nf_queue_entry	*nf_queue_entry;
@@ -1307,8 +1307,8 @@ index dec1748..1f17280 100644
  extern void kfree_skb_list(struct sk_buff *segs);
  extern void skb_tx_error(struct sk_buff *skb);
 @@ -2754,6 +2773,10 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src)
- 	dst->nfct_reasm = src->nfct_reasm;
- 	nf_conntrack_get_reasm(src->nfct_reasm);
+ 	nf_conntrack_get(src->nfct);
+ 	dst->nfctinfo = src->nfctinfo;
  #endif
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +	dst->imq_flags = src->imq_flags;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/1d08646979a4b1d713aeb49016b92b3f61113162