aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/multipath_wrandom.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-02-22 04:26:32 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-26 14:43:00 -0500
commit4c3ae4d7e727eac6f6eb23587cef0413734d4ae1 (patch)
tree9ab908c6b7bf0120a407d9343b15db939d489476 /net/ipv4/multipath_wrandom.c
parent269def7c505b4d229f9ad49bf88543d1e605533e (diff)
[IPV4]: Use random32() in net/ipv4/multipath
Removed local random number generator function Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/multipath_wrandom.c')
-rw-r--r--net/ipv4/multipath_wrandom.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c
index 2bdbb92b450a..57c503694539 100644
--- a/net/ipv4/multipath_wrandom.c
+++ b/net/ipv4/multipath_wrandom.c
@@ -32,6 +32,7 @@
32#include <linux/module.h> 32#include <linux/module.h>
33#include <linux/mroute.h> 33#include <linux/mroute.h>
34#include <linux/init.h> 34#include <linux/init.h>
35#include <linux/random.h>
35#include <net/ip.h> 36#include <net/ip.h>
36#include <net/protocol.h> 37#include <net/protocol.h>
37#include <linux/skbuff.h> 38#include <linux/skbuff.h>
@@ -84,18 +85,6 @@ struct multipath_route {
84/* state: primarily weight per route information */ 85/* state: primarily weight per route information */
85static struct multipath_bucket state[MULTIPATH_STATE_SIZE]; 86static struct multipath_bucket state[MULTIPATH_STATE_SIZE];
86 87
87/* interface to random number generation */
88static unsigned int RANDOM_SEED = 93186752;
89
90static inline unsigned int random(unsigned int ubound)
91{
92 static unsigned int a = 1588635695,
93 q = 2,
94 r = 1117695901;
95 RANDOM_SEED = a*(RANDOM_SEED % q) - r*(RANDOM_SEED / q);
96 return RANDOM_SEED % ubound;
97}
98
99static unsigned char __multipath_lookup_weight(const struct flowi *fl, 88static unsigned char __multipath_lookup_weight(const struct flowi *fl,
100 const struct rtable *rt) 89 const struct rtable *rt)
101{ 90{
@@ -193,7 +182,7 @@ static void wrandom_select_route(const struct flowi *flp,
193 182
194 /* choose a weighted random candidate */ 183 /* choose a weighted random candidate */
195 decision = first; 184 decision = first;
196 selector = random(power); 185 selector = random32() % power;
197 last_power = 0; 186 last_power = 0;
198 187
199 /* select candidate, adjust GC data and cleanup local state */ 188 /* select candidate, adjust GC data and cleanup local state */