aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-08 15:06:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-08 15:06:38 +0000
commit8b30a1806c020237e809f54ae715ca3eb5cee3ba (patch)
treedc1edfa5c40adf16e3627d491a0648ae994cecd4 /target
parentac26fab9cea25bf50aad93ddde793876d100f05e (diff)
downloadupstream-8b30a1806c020237e809f54ae715ca3eb5cee3ba.tar.gz
upstream-8b30a1806c020237e809f54ae715ca3eb5cee3ba.tar.bz2
upstream-8b30a1806c020237e809f54ae715ca3eb5cee3ba.zip
kernel: revert the change from JHASH_GOLDEN_RATIO to JHASH_INIT_PARAM (ipv6 still relies on it)
SVN-Revision: 15155
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/201-jhash3.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/201-jhash3.patch b/target/linux/generic-2.6/patches-2.6.28/201-jhash3.patch
index 260481eb53..0218fa19c5 100644
--- a/target/linux/generic-2.6/patches-2.6.28/201-jhash3.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/201-jhash3.patch
@@ -70,7 +70,7 @@
-/* The golden ration: an arbitrary value */
-#define JHASH_GOLDEN_RATIO 0x9e3779b9
+/* An arbitrary initial parameter */
-+#define JHASH_INIT_PARAM 0xdeadbeef
++#define JHASH_GOLDEN_RATIO 0xdeadbeef
/* The most generic version, hashes an arbitrary sequence
* of bytes. No alignment or length assumptions are made about
@@ -94,7 +94,7 @@
-
- __jhash_mix(a,b,c);
+ /* Set up the internal state */
-+ a = b = c = JHASH_INIT_PARAM + length + initval;
++ a = b = c = JHASH_GOLDEN_RATIO + length + initval;
+ /* all but the last block: affect some 32 bits of (a,b,c) */
+ while (length > 12) {
@@ -154,7 +154,7 @@
- c = initval;
- len = length;
+ /* Set up the internal state */
-+ a = b = c = JHASH_INIT_PARAM + (length<<2) + initval;
++ a = b = c = JHASH_GOLDEN_RATIO + (length<<2) + initval;
- while (len >= 3) {
+ /* handle most of the key */
@@ -202,9 +202,9 @@
- a += JHASH_GOLDEN_RATIO;
- b += JHASH_GOLDEN_RATIO;
- c += initval;
-+ a += JHASH_INIT_PARAM + initval;
-+ b += JHASH_INIT_PARAM + initval;
-+ c += JHASH_INIT_PARAM + initval;
++ a += JHASH_GOLDEN_RATIO + initval;
++ b += JHASH_GOLDEN_RATIO + initval;
++ c += JHASH_GOLDEN_RATIO + initval;
- __jhash_mix(a, b, c);
+ __jhash_final(a, b, c);