Use the new hash really.

References to the old include file replaced with new one in order to
really use the new Jenkins' hash function.

diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 1ed0fbb79998c17f57a29b40fcdd4fcdc5108f68..1c6e650cb941560479881ff1af9a4931f13c0cbb 100644 (file)
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+2.4.9
+  - References to the old include file replaced with new one in order to
+    really use the new Jenkins' hash function.
+
 2.4.8
   - The Jenkins' hash lookup2() replaced with Jenkins' faster/better lookup3()
     hash function.

diff --git a/kernel/ip_set.c b/kernel/ip_set.c
index f60a63e05b348791cc9b0158e8f8b0f2f7194f3b..f52647fe57ff3c7bb19d84a4bd01ee8e51c2ac86 100644 (file)
--- a/kernel/ip_set.c
+++ b/kernel/ip_set.c
@@ -19,7 +19,7 @@
 #include <linux/ip.h>
 #include <linux/skbuff.h>
 #include <linux/random.h>
-#include <linux/jhash.h>
+#include <linux/netfilter_ipv4/ip_set_jhash.h>
 #include <linux/errno.h>
 #include <linux/capability.h>
 #include <asm/uaccess.h>

diff --git a/kernel/ip_set_iphash.c b/kernel/ip_set_iphash.c
index b1bccc14e11672479e9fb359cb2cfb9e44fe6326..aac3eec7787d9390bfc110ce73194532b0bef520 100644 (file)
--- a/kernel/ip_set_iphash.c
+++ b/kernel/ip_set_iphash.c
@@ -11,7 +11,7 @@
 #include <linux/moduleparam.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
-#include <linux/jhash.h>
+#include <linux/netfilter_ipv4/ip_set_jhash.h>
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>

diff --git a/kernel/ip_set_ipporthash.c b/kernel/ip_set_ipporthash.c
index 23528582242316394f45eb7341ea91c6fd17e505..c41c0a8b4e2ae6e43559d3d6b9f53c66b210d428 100644 (file)
--- a/kernel/ip_set_ipporthash.c
+++ b/kernel/ip_set_ipporthash.c
@@ -13,7 +13,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/skbuff.h>
-#include <linux/jhash.h>
+#include <linux/netfilter_ipv4/ip_set_jhash.h>
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>

diff --git a/kernel/ip_set_ipportiphash.c b/kernel/ip_set_ipportiphash.c
index e0725d9706c27a928393291e1886832d8c2a559a..166bec4d3e81a075e34f4ef19f87aa5390f39536 100644 (file)
--- a/kernel/ip_set_ipportiphash.c
+++ b/kernel/ip_set_ipportiphash.c
@@ -13,7 +13,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/skbuff.h>
-#include <linux/jhash.h>
+#include <linux/netfilter_ipv4/ip_set_jhash.h>
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>

diff --git a/kernel/ip_set_ipportnethash.c b/kernel/ip_set_ipportnethash.c
index 267370a267ddcc3420ceff161667a6f234f4007a..fe36c589d9713e0a0220464635066c929930a6a9 100644 (file)
--- a/kernel/ip_set_ipportnethash.c
+++ b/kernel/ip_set_ipportnethash.c
@@ -13,7 +13,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/skbuff.h>
-#include <linux/jhash.h>
+#include <linux/netfilter_ipv4/ip_set_jhash.h>
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>

diff --git a/kernel/ip_set_nethash.c b/kernel/ip_set_nethash.c
index 268fe6a74595c31652e262392d85728816b6b5d4..27267d9da07f69cb4af5c4cc9107e508491f2216 100644 (file)
--- a/kernel/ip_set_nethash.c
+++ b/kernel/ip_set_nethash.c
@@ -11,7 +11,7 @@
 #include <linux/moduleparam.h>
 #include <linux/ip.h>
 #include <linux/skbuff.h>
-#include <linux/jhash.h>
+#include <linux/netfilter_ipv4/ip_set_jhash.h>
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>