git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
net
/
core
/
skbuff.c
diff --git
a/net/core/skbuff.c
b/net/core/skbuff.c
index
c34a3a9
..
f774929
100644
(file)
--- a/
net/core/skbuff.c
+++ b/
net/core/skbuff.c
@@
-311,6
+311,7
@@
struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask)
C(nfcache);
C(nfct);
nf_conntrack_get(skb->nfct);
C(nfcache);
C(nfct);
nf_conntrack_get(skb->nfct);
+ C(nfctinfo);
#ifdef CONFIG_NETFILTER_DEBUG
C(nf_debug);
#endif
#ifdef CONFIG_NETFILTER_DEBUG
C(nf_debug);
#endif
@@
-377,6
+378,7
@@
static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
new->nfcache = old->nfcache;
new->nfct = old->nfct;
nf_conntrack_get(old->nfct);
new->nfcache = old->nfcache;
new->nfct = old->nfct;
nf_conntrack_get(old->nfct);
+ new->nfctinfo = old->nfctinfo;
#ifdef CONFIG_NETFILTER_DEBUG
new->nf_debug = old->nf_debug;
#endif
#ifdef CONFIG_NETFILTER_DEBUG
new->nf_debug = old->nf_debug;
#endif