| 1 |
pva 09/02/26 17:02:00 |
| 2 |
|
| 3 |
Added: ipset-2.4.8-use-new-hash.patch |
| 4 |
Log: |
| 5 |
Version bump, bug #260338, thank BoneKracker for report. Disable warnings, fixes bug #259999, thank Aleksey Kunitskiy for report. |
| 6 |
(Portage version: 2.2_rc23/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-firewall/ipset/files/ipset-2.4.8-use-new-hash.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/files/ipset-2.4.8-use-new-hash.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/files/ipset-2.4.8-use-new-hash.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ipset-2.4.8-use-new-hash.patch |
| 15 |
=================================================================== |
| 16 |
From: Jozsef Kadlecsik <kadlec@××××××××××××××.hu> |
| 17 |
Date: Wed, 11 Feb 2009 13:00:35 +0000 (+0100) |
| 18 |
Subject: Use the new hash really. |
| 19 |
X-Git-Tag: v2.4.9~1 |
| 20 |
X-Git-Url: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=ipset.git;a=commitdiff_plain;h=31c93a74639077ee39b448ff47f446b4864cfaea |
| 21 |
|
| 22 |
Use the new hash really. |
| 23 |
|
| 24 |
References to the old include file replaced with new one in order to |
| 25 |
really use the new Jenkins' hash function. |
| 26 |
--- |
| 27 |
|
| 28 |
diff --git a/kernel/ChangeLog b/kernel/ChangeLog |
| 29 |
index 1ed0fbb..1c6e650 100644 |
| 30 |
--- a/kernel/ChangeLog |
| 31 |
+++ b/kernel/ChangeLog |
| 32 |
@@ -1,3 +1,7 @@ |
| 33 |
+2.4.9 |
| 34 |
+ - References to the old include file replaced with new one in order to |
| 35 |
+ really use the new Jenkins' hash function. |
| 36 |
+ |
| 37 |
2.4.8 |
| 38 |
- The Jenkins' hash lookup2() replaced with Jenkins' faster/better lookup3() |
| 39 |
hash function. |
| 40 |
diff --git a/kernel/ip_set.c b/kernel/ip_set.c |
| 41 |
index f60a63e..f52647f 100644 |
| 42 |
--- a/kernel/ip_set.c |
| 43 |
+++ b/kernel/ip_set.c |
| 44 |
@@ -19,7 +19,7 @@ |
| 45 |
#include <linux/ip.h> |
| 46 |
#include <linux/skbuff.h> |
| 47 |
#include <linux/random.h> |
| 48 |
-#include <linux/jhash.h> |
| 49 |
+#include <linux/netfilter_ipv4/ip_set_jhash.h> |
| 50 |
#include <linux/errno.h> |
| 51 |
#include <linux/capability.h> |
| 52 |
#include <asm/uaccess.h> |
| 53 |
diff --git a/kernel/ip_set_iphash.c b/kernel/ip_set_iphash.c |
| 54 |
index b1bccc1..aac3eec 100644 |
| 55 |
--- a/kernel/ip_set_iphash.c |
| 56 |
+++ b/kernel/ip_set_iphash.c |
| 57 |
@@ -11,7 +11,7 @@ |
| 58 |
#include <linux/moduleparam.h> |
| 59 |
#include <linux/ip.h> |
| 60 |
#include <linux/skbuff.h> |
| 61 |
-#include <linux/jhash.h> |
| 62 |
+#include <linux/netfilter_ipv4/ip_set_jhash.h> |
| 63 |
#include <linux/errno.h> |
| 64 |
#include <asm/uaccess.h> |
| 65 |
#include <asm/bitops.h> |
| 66 |
diff --git a/kernel/ip_set_ipporthash.c b/kernel/ip_set_ipporthash.c |
| 67 |
index 2352858..c41c0a8 100644 |
| 68 |
--- a/kernel/ip_set_ipporthash.c |
| 69 |
+++ b/kernel/ip_set_ipporthash.c |
| 70 |
@@ -13,7 +13,7 @@ |
| 71 |
#include <linux/tcp.h> |
| 72 |
#include <linux/udp.h> |
| 73 |
#include <linux/skbuff.h> |
| 74 |
-#include <linux/jhash.h> |
| 75 |
+#include <linux/netfilter_ipv4/ip_set_jhash.h> |
| 76 |
#include <linux/errno.h> |
| 77 |
#include <asm/uaccess.h> |
| 78 |
#include <asm/bitops.h> |
| 79 |
diff --git a/kernel/ip_set_ipportiphash.c b/kernel/ip_set_ipportiphash.c |
| 80 |
index e0725d9..166bec4 100644 |
| 81 |
--- a/kernel/ip_set_ipportiphash.c |
| 82 |
+++ b/kernel/ip_set_ipportiphash.c |
| 83 |
@@ -13,7 +13,7 @@ |
| 84 |
#include <linux/tcp.h> |
| 85 |
#include <linux/udp.h> |
| 86 |
#include <linux/skbuff.h> |
| 87 |
-#include <linux/jhash.h> |
| 88 |
+#include <linux/netfilter_ipv4/ip_set_jhash.h> |
| 89 |
#include <linux/errno.h> |
| 90 |
#include <asm/uaccess.h> |
| 91 |
#include <asm/bitops.h> |
| 92 |
diff --git a/kernel/ip_set_ipportnethash.c b/kernel/ip_set_ipportnethash.c |
| 93 |
index 267370a..fe36c58 100644 |
| 94 |
--- a/kernel/ip_set_ipportnethash.c |
| 95 |
+++ b/kernel/ip_set_ipportnethash.c |
| 96 |
@@ -13,7 +13,7 @@ |
| 97 |
#include <linux/tcp.h> |
| 98 |
#include <linux/udp.h> |
| 99 |
#include <linux/skbuff.h> |
| 100 |
-#include <linux/jhash.h> |
| 101 |
+#include <linux/netfilter_ipv4/ip_set_jhash.h> |
| 102 |
#include <linux/errno.h> |
| 103 |
#include <asm/uaccess.h> |
| 104 |
#include <asm/bitops.h> |
| 105 |
diff --git a/kernel/ip_set_nethash.c b/kernel/ip_set_nethash.c |
| 106 |
index 268fe6a..27267d9 100644 |
| 107 |
--- a/kernel/ip_set_nethash.c |
| 108 |
+++ b/kernel/ip_set_nethash.c |
| 109 |
@@ -11,7 +11,7 @@ |
| 110 |
#include <linux/moduleparam.h> |
| 111 |
#include <linux/ip.h> |
| 112 |
#include <linux/skbuff.h> |
| 113 |
-#include <linux/jhash.h> |
| 114 |
+#include <linux/netfilter_ipv4/ip_set_jhash.h> |
| 115 |
#include <linux/errno.h> |
| 116 |
#include <asm/uaccess.h> |
| 117 |
#include <asm/bitops.h> |
Archives