[PATCH 1/2] nf_conntrack: use ipv6_addr_equal in nf_ct_reasm

[PATCH 1/2] nf_conntrack: use ipv6_addr_equal in nf_ct_reasm

[Yasuyuki KOZAKAI]

[-- Attachment #1: 02-nfct-reasm-cleanup.patch --]
[-- Type: Text/Plain, Size: 1681 bytes --]

[NETFILTER] nf_conntrack: use ipv6_addr_equal in nf_ct_reasm

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>

---
commit 629a7391cc095248a79153f37977ce9f1071c14d
tree 752505fb5c8b30901c248ce0a651fc92b51da48b
parent 74cb8798222bb7d1aecb0acb91e6eeedf5feb948
author Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Sun, 25 Dec 2005 19:54:14 +0900
committer Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Thu, 05 Jan 2006 15:25:29 +0900

 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 f3e5ffb..ab3387d 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -324,8 +324,8 @@ static struct nf_ct_frag6_queue *nf_ct_f
 #ifdef CONFIG_SMP
 	for (fq = nf_ct_frag6_hash[hash]; fq; fq = fq->next) {
 		if (fq->id == fq_in->id && 
-		    !ipv6_addr_cmp(&fq_in->saddr, &fq->saddr) &&
-		    !ipv6_addr_cmp(&fq_in->daddr, &fq->daddr)) {
+		    ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&
+		    ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {
 			atomic_inc(&fq->refcnt);
 			write_unlock(&nf_ct_frag6_lock);
 			fq_in->last_in |= COMPLETE;
@@ -389,8 +389,8 @@ fq_find(u32 id, struct in6_addr *src, st
 	read_lock(&nf_ct_frag6_lock);
 	for (fq = nf_ct_frag6_hash[hash]; fq; fq = fq->next) {
 		if (fq->id == id && 
-		    !ipv6_addr_cmp(src, &fq->saddr) &&
-		    !ipv6_addr_cmp(dst, &fq->daddr)) {
+		    ipv6_addr_equal(src, &fq->saddr) &&
+		    ipv6_addr_equal(dst, &fq->daddr)) {
 			atomic_inc(&fq->refcnt);
 			read_unlock(&nf_ct_frag6_lock);
 			return fq;

Re: [PATCH 1/2] nf_conntrack: use ipv6_addr_equal in nf_ct_reasm

[Patrick McHardy]

Yasuyuki KOZAKAI wrote:
> [NETFILTER] nf_conntrack: use ipv6_addr_equal in nf_ct_reasm

It seems this one got lost (2/2 is already in Linus' tree). I've
added it to my tree now, thanks.