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 <aruna.hewapathirane@gmail.com>
Suggested-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 8 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index b0cd122e5fb4..5329cccf55dc 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3104,7 +3104,7 @@ static void addrconf_dad_kick(struct inet6_ifaddr *ifp)
         if (ifp->flags & IFA_F_OPTIMISTIC)
                 rand_num = 0;
         else
-                rand_num = net_random() % (idev->cnf.rtr_solicit_delay ? : 1);
+                rand_num = prandom_u32() % (idev->cnf.rtr_solicit_delay ? : 1);
 
         ifp->dad_probes = idev->cnf.dad_transmits;
         addrconf_mod_dad_timer(ifp, rand_num);
@@ -3117,7 +3117,7 @@ static void addrconf_dad_start(struct inet6_ifaddr *ifp)
 
         addrconf_join_solict(dev, &ifp->addr);
 
-        net_srandom(ifp->addr.s6_addr32[3]);
+        prandom_seed((__force u32) ifp->addr.s6_addr32[3]);
 
         read_lock_bh(&idev->lock);
         spin_lock(&ifp->lock);
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index e7fb7106550f..cbc93517b455 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -210,7 +210,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net,
         spin_lock_bh(&ip6_fl_lock);
         if (label == 0) {
                 for (;;) {
-                        fl->label = htonl(net_random())&IPV6_FLOWLABEL_MASK;
+                        fl->label = htonl(prandom_u32())&IPV6_FLOWLABEL_MASK;
                         if (fl->label) {
                                 lfl = __fl_lookup(net, fl->label);
                                 if (lfl == NULL)
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index d18f9f903db6..7ff82b3e54b6 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -999,7 +999,7 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,
 
 static void mld_gq_start_timer(struct inet6_dev *idev)
 {
-        unsigned long tv = net_random() % idev->mc_maxdelay;
+        unsigned long tv = prandom_u32() % idev->mc_maxdelay;
 
         idev->mc_gq_running = 1;
         if (!mod_timer(&idev->mc_gq_timer, jiffies+tv+2))
@@ -1015,7 +1015,7 @@ static void mld_gq_stop_timer(struct inet6_dev *idev)
 
 static void mld_ifc_start_timer(struct inet6_dev *idev, unsigned long delay)
 {
-        unsigned long tv = net_random() % delay;
+        unsigned long tv = prandom_u32() % delay;
 
         if (!mod_timer(&idev->mc_ifc_timer, jiffies+tv+2))
                 in6_dev_hold(idev);
@@ -1030,7 +1030,7 @@ static void mld_ifc_stop_timer(struct inet6_dev *idev)
 
 static void mld_dad_start_timer(struct inet6_dev *idev, unsigned long delay)
 {
-        unsigned long tv = net_random() % delay;
+        unsigned long tv = prandom_u32() % delay;
 
         if (!mod_timer(&idev->mc_dad_timer, jiffies+tv+2))
                 in6_dev_hold(idev);
@@ -1061,7 +1061,7 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime)
         }
 
         if (delay >= resptime)
-                delay = net_random() % resptime;
+                delay = prandom_u32() % resptime;
 
         ma->mca_timer.expires = jiffies + delay;
         if (!mod_timer(&ma->mca_timer, jiffies + delay))
@@ -2328,7 +2328,7 @@ static void igmp6_join_group(struct ifmcaddr6 *ma)
 
         igmp6_send(&ma->mca_addr, ma->idev->dev, ICMPV6_MGM_REPORT);
 
-        delay = net_random() % unsolicited_report_interval(ma->idev);
+        delay = prandom_u32() % unsolicited_report_interval(ma->idev);
 
         spin_lock_bh(&ma->mca_lock);
         if (del_timer(&ma->mca_timer)) {