From 22c914789e8cbaa4858e0e1002f838b850a25668 Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 20 Sep 2012 06:52:05 +0000
Subject: [PATCH] Utilize Jenkins hash with random seed for source nodes
 storage.

---
 sys/net/pfvar.h     | 22 ----------------------
 sys/netpfil/pf/pf.c | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index bccbefe5499d..c16591bacea2 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1730,28 +1730,6 @@ extern int			 pf_state_insert(struct pfi_kif *,
 				    struct pf_state *);
 extern void			 pf_free_state(struct pf_state *);
 
-static __inline u_int
-pf_hashsrc(struct pf_addr *addr, sa_family_t af)
-{
-	u_int h;
-
-#define	ADDR_HASH(a)	((a) ^ ((a) >> 16))
-
-	switch (af) {
-	case AF_INET:
-		h = ADDR_HASH(addr->v4.s_addr);
-		break;
-	case AF_INET6:
-		h = ADDR_HASH(addr->v6.__u6_addr.__u6_addr32[3]);
-		break;
-	default:
-		panic("%s: unknown address family %u", __func__, af);
-	}
-#undef ADDR_HASH
-
-	return (h & V_pf_srchashmask);
-}
-
 static __inline void
 pf_ref_state(struct pf_state *s)
 {
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 74b3a64bf5c3..3f23c356109b 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -387,6 +387,27 @@ pf_hashkey(struct pf_state_key *sk)
 	return (h & V_pf_hashmask);
 }
 
+static __inline uint32_t
+pf_hashsrc(struct pf_addr *addr, sa_family_t af)
+{
+	uint32_t h;
+
+	switch (af) {
+	case AF_INET:
+		h = jenkins_hash32((uint32_t *)&addr->v4,
+		    sizeof(addr->v4)/sizeof(uint32_t), V_pf_hashseed);
+		break;
+	case AF_INET6:
+		h = jenkins_hash32((uint32_t *)&addr->v6,
+		    sizeof(addr->v6)/sizeof(uint32_t), V_pf_hashseed);
+		break;
+	default:
+		panic("%s: unknown address family %u", __func__, af);
+	}
+
+	return (h & V_pf_srchashmask);
+}
+
 #ifdef INET6
 void
 pf_addrcpy(struct pf_addr *dst, struct pf_addr *src, sa_family_t af)