From 9d6ff23674866a2b864d6efc94b767ce6a639c48 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 10 Apr 2008 01:54:01 -0700
Subject: [PATCH] --- yaml --- r: 90601 b: refs/heads/master c:
 1294fc4a4868d7e83ff749597fbf4e9d5f4d1aa0 h: refs/heads/master i:   90599:
 1ad0847444479d01409ace40aff2024630516044 v: v3

---
 [refs]                 |  2 +-
 trunk/net/ipv4/route.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3189a5ede092..dd1563c57c22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5969f71d57928511b9cd8744aaf1ed9bc5e88ea2
+refs/heads/master: 1294fc4a4868d7e83ff749597fbf4e9d5f4d1aa0
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index d758ea1d80f6..7cdd2bf88e0c 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -259,16 +259,14 @@ static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat);
 #define RT_CACHE_STAT_INC(field) \
 	(__raw_get_cpu_var(rt_cache_stat).field++)
 
-static unsigned int rt_hash_code(u32 daddr, u32 saddr)
+static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx)
 {
-	return jhash_2words(daddr, saddr, atomic_read(&rt_genid))
+	return jhash_3words((__force u32)(__be32)(daddr),
+			    (__force u32)(__be32)(saddr),
+			    idx, atomic_read(&rt_genid))
 		& rt_hash_mask;
 }
 
-#define rt_hash(daddr, saddr, idx) \
-	rt_hash_code((__force u32)(__be32)(daddr),\
-		     (__force u32)(__be32)(saddr) ^ ((idx) << 5))
-
 #ifdef CONFIG_PROC_FS
 struct rt_cache_iter_state {
 	struct seq_net_private p;