diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2006-03-20 20:58:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-20 20:58:44 -0500 |
commit | 6ea46c9c12da79ec6eead0cf4b3114143dd30bc1 (patch) | |
tree | ab5e54f8d365d5ae4645b72116cdf9a78a53249f /net | |
parent | f2ad52c9da2229d7f038d02139d21478b33b76b4 (diff) |
[NETFILTER]: nf_conntrack: use ipv6_addr_equal in nf_ct_reasm
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 84ef9a13108d..3e319035f82d 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -313,8 +313,8 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash, | |||
313 | #ifdef CONFIG_SMP | 313 | #ifdef CONFIG_SMP |
314 | hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) { | 314 | hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) { |
315 | if (fq->id == fq_in->id && | 315 | if (fq->id == fq_in->id && |
316 | !ipv6_addr_cmp(&fq_in->saddr, &fq->saddr) && | 316 | ipv6_addr_equal(&fq_in->saddr, &fq->saddr) && |
317 | !ipv6_addr_cmp(&fq_in->daddr, &fq->daddr)) { | 317 | ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) { |
318 | atomic_inc(&fq->refcnt); | 318 | atomic_inc(&fq->refcnt); |
319 | write_unlock(&nf_ct_frag6_lock); | 319 | write_unlock(&nf_ct_frag6_lock); |
320 | fq_in->last_in |= COMPLETE; | 320 | fq_in->last_in |= COMPLETE; |
@@ -376,8 +376,8 @@ fq_find(u32 id, struct in6_addr *src, struct in6_addr *dst) | |||
376 | read_lock(&nf_ct_frag6_lock); | 376 | read_lock(&nf_ct_frag6_lock); |
377 | hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) { | 377 | hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) { |
378 | if (fq->id == id && | 378 | if (fq->id == id && |
379 | !ipv6_addr_cmp(src, &fq->saddr) && | 379 | ipv6_addr_equal(src, &fq->saddr) && |
380 | !ipv6_addr_cmp(dst, &fq->daddr)) { | 380 | ipv6_addr_equal(dst, &fq->daddr)) { |
381 | atomic_inc(&fq->refcnt); | 381 | atomic_inc(&fq->refcnt); |
382 | read_unlock(&nf_ct_frag6_lock); | 382 | read_unlock(&nf_ct_frag6_lock); |
383 | return fq; | 383 | return fq; |