Patchwork [net-next] ipv6: optimize inet6_hash_frag()

login
register
mail settings
Submitter Eric Dumazet
Date Feb. 16, 2013, 4:14 a.m.
Message ID <1360988088.19353.46.camel@edumazet-glaptop>
Download mbox | patch
Permalink /patch/220927/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Feb. 16, 2013, 4:14 a.m.
From: Eric Dumazet <edumazet@google.com>

Use ipv6_addr_hash() and a single jhash invocation.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/ipv6/reassembly.c |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Feb. 18, 2013, 5:24 p.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 15 Feb 2013 20:14:48 -0800

> From: Eric Dumazet <edumazet@google.com>
> 
> Use ipv6_addr_hash() and a single jhash invocation.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index e354743..9a6428a 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -79,20 +79,7 @@  unsigned int inet6_hash_frag(__be32 id, const struct in6_addr *saddr,
 {
 	u32 c;
 
-	c = jhash_3words((__force u32)saddr->s6_addr32[0],
-			 (__force u32)saddr->s6_addr32[1],
-			 (__force u32)saddr->s6_addr32[2],
-			 rnd);
-
-	c = jhash_3words((__force u32)saddr->s6_addr32[3],
-			 (__force u32)daddr->s6_addr32[0],
-			 (__force u32)daddr->s6_addr32[1],
-			 c);
-
-	c =  jhash_3words((__force u32)daddr->s6_addr32[2],
-			  (__force u32)daddr->s6_addr32[3],
-			  (__force u32)id,
-			  c);
+	c = jhash_3words(ipv6_addr_hash(saddr), ipv6_addr_hash(daddr), id, rnd);
 
 	return c & (INETFRAGS_HASHSZ - 1);
 }