mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
net: replace macros net_random and net_srandom with direct calls to prandom
This patch removes the net_random and net_srandom macros and replaces them with direct calls to the prandom ones. As new commits only seem to use prandom_u32 there is no use to keep them around. This change makes it easier to grep for users of prandom_u32. Signed-off-by: Aruna-Hewapathirane <[email protected]> Suggested-by: Hannes Frederic Sowa <[email protected]> Acked-by: Hannes Frederic Sowa <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
825edac4e7
commit
63862b5bef
30 changed files with 50 additions and 51 deletions
|
|
@ -464,7 +464,7 @@ static int __inet_insert_ifa(struct in_ifaddr *ifa, struct nlmsghdr *nlh,
|
|||
}
|
||||
|
||||
if (!(ifa->ifa_flags & IFA_F_SECONDARY)) {
|
||||
net_srandom(ifa->ifa_local);
|
||||
prandom_seed((__force u32) ifa->ifa_local);
|
||||
ifap = last_primary;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ static void igmp_stop_timer(struct ip_mc_list *im)
|
|||
/* It must be called with locked im->lock */
|
||||
static void igmp_start_timer(struct ip_mc_list *im, int max_delay)
|
||||
{
|
||||
int tv = net_random() % max_delay;
|
||||
int tv = prandom_u32() % max_delay;
|
||||
|
||||
im->tm_running = 1;
|
||||
if (!mod_timer(&im->timer, jiffies+tv+2))
|
||||
|
|
@ -220,7 +220,7 @@ static void igmp_start_timer(struct ip_mc_list *im, int max_delay)
|
|||
|
||||
static void igmp_gq_start_timer(struct in_device *in_dev)
|
||||
{
|
||||
int tv = net_random() % in_dev->mr_maxdelay;
|
||||
int tv = prandom_u32() % in_dev->mr_maxdelay;
|
||||
|
||||
in_dev->mr_gq_running = 1;
|
||||
if (!mod_timer(&in_dev->mr_gq_timer, jiffies+tv+2))
|
||||
|
|
@ -229,7 +229,7 @@ static void igmp_gq_start_timer(struct in_device *in_dev)
|
|||
|
||||
static void igmp_ifc_start_timer(struct in_device *in_dev, int delay)
|
||||
{
|
||||
int tv = net_random() % delay;
|
||||
int tv = prandom_u32() % delay;
|
||||
|
||||
if (!mod_timer(&in_dev->mr_ifc_timer, jiffies+tv+2))
|
||||
in_dev_hold(in_dev);
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum)
|
|||
again:
|
||||
inet_get_local_port_range(net, &low, &high);
|
||||
remaining = (high - low) + 1;
|
||||
smallest_rover = rover = net_random() % remaining + low;
|
||||
smallest_rover = rover = prandom_u32() % remaining + low;
|
||||
|
||||
smallest_size = -1;
|
||||
do {
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ int udp_lib_get_port(struct sock *sk, unsigned short snum,
|
|||
inet_get_local_port_range(net, &low, &high);
|
||||
remaining = (high - low) + 1;
|
||||
|
||||
rand = net_random();
|
||||
rand = prandom_u32();
|
||||
first = (((u64)rand * remaining) >> 32) + low;
|
||||
/*
|
||||
* force rand to be an odd multiple of UDP_HTABLE_SIZE
|
||||
|
|
|
|||
Loading…
Reference in a new issue