summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorShan Wei <shanwei@cn.fujitsu.com>2010-01-26 02:40:38 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-26 05:13:27 -0800
commitc92b544bd5d8e7ed7d81c77bbecab6df2a95aa53 (patch)
tree9e451dc5abdfbcb10cbbf9232d1646537a7936ff /net
parent39d321577405e8e269fd238b278aaf2425fa788a (diff)
downloadlinux-stable-c92b544bd5d8e7ed7d81c77bbecab6df2a95aa53.tar.gz
linux-stable-c92b544bd5d8e7ed7d81c77bbecab6df2a95aa53.tar.bz2
linux-stable-c92b544bd5d8e7ed7d81c77bbecab6df2a95aa53.zip
ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure
The commit 0b5ccb2(title:ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery) has broken the saddr&&daddr member of nf_ct_frag6_queue when creating new queue. And then hash value generated by nf_hashfn() was not equal with that generated by fq_find(). So, a new received fragment can't be inserted to right queue. The patch fixes the bug with adding member of user to nf_ct_frag6_queue structure. Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 312c20adc83f..624a54832a7c 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -63,6 +63,7 @@ struct nf_ct_frag6_queue
struct inet_frag_queue q;
__be32 id; /* fragment id */
+ u32 user;
struct in6_addr saddr;
struct in6_addr daddr;