summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-02-15 18:14:48 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-18 12:23:51 -0500
commit279e9f2ff7351a7908f964332e778049712cbd5b (patch)
tree182352c3facc2d15330d38db67930431685424cd /net
parentc8c5b287152bfd10c27390d36df2a8131cf906f5 (diff)
downloadlinux-3.10-279e9f2ff7351a7908f964332e778049712cbd5b.tar.gz
linux-3.10-279e9f2ff7351a7908f964332e778049712cbd5b.tar.bz2
linux-3.10-279e9f2ff7351a7908f964332e778049712cbd5b.zip
ipv6: optimize inet6_hash_frag()
Use ipv6_addr_hash() and a single jhash invocation. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/reassembly.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index e354743ed42..9a6428aaa2d 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);
}