diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-08 21:51:36 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-08 21:51:36 +0000 |
commit | 3ba8f67bac8f610b5148b93280387d3dccf7d0dd (patch) | |
tree | 6a17c20128c75787aad74ca2e98c128bd4ed8e55 /lib | |
parent | a8eb5f1e4b10d8b7992ed0e6c0915687339201c3 (diff) | |
parent | 925b33756551cb5304774d2e2b39e26e82308a68 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'lib')
-rw-r--r-- | lib/random32.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/random32.c b/lib/random32.c index 52280d5526b..01e8890d108 100644 --- a/lib/random32.c +++ b/lib/random32.c @@ -141,7 +141,7 @@ void prandom_seed(u32 entropy) */ for_each_possible_cpu (i) { struct rnd_state *state = &per_cpu(net_rand_state, i); - state->s1 = __seed(state->s1 ^ entropy, 1); + state->s1 = __seed(state->s1 ^ entropy, 2); } } EXPORT_SYMBOL(prandom_seed); @@ -158,9 +158,9 @@ static int __init prandom_init(void) struct rnd_state *state = &per_cpu(net_rand_state,i); #define LCG(x) ((x) * 69069) /* super-duper LCG */ - state->s1 = __seed(LCG(i + jiffies), 1); - state->s2 = __seed(LCG(state->s1), 7); - state->s3 = __seed(LCG(state->s2), 15); + state->s1 = __seed(LCG(i + jiffies), 2); + state->s2 = __seed(LCG(state->s1), 8); + state->s3 = __seed(LCG(state->s2), 16); /* "warm it up" */ prandom_u32_state(state); @@ -187,9 +187,9 @@ static int __init prandom_reseed(void) u32 seeds[3]; get_random_bytes(&seeds, sizeof(seeds)); - state->s1 = __seed(seeds[0], 1); - state->s2 = __seed(seeds[1], 7); - state->s3 = __seed(seeds[2], 15); + state->s1 = __seed(seeds[0], 2); + state->s2 = __seed(seeds[1], 8); + state->s3 = __seed(seeds[2], 16); /* mix it in */ prandom_u32_state(state); |