From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Jesse Gross <jesse@nicira.com>,
Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>,
Vlad Yasevich <vyasevich@gmail.com>,
Sridhar Samudrala <sri@us.ibm.com>,
Neil Horman <nhorman@tuxdriver.com>,
Steffen Klassert <steffen.klassert@secunet.com>,
Herbert Xu <herbert@gondor.hengli.com.au>,
"David S. Miller" <davem@davemloft.net>,
linux-sctp@vger.kernel.org, dev@openvswitch.org,
netdev@vger.kernel.org
Subject: [PATCH 28/29] net/: rename net_random() to prandom_u32()
Date: Mon, 24 Dec 2012 02:14:15 +0000 [thread overview]
Message-ID: <1356315256-6572-29-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com>
Use more preferable function name which implies using a pseudo-random
number generator.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Jesse Gross <jesse@nicira.com>
Cc: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Sridhar Samudrala <sri@us.ibm.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-sctp@vger.kernel.org
Cc: dev@openvswitch.org
Cc: netdev@vger.kernel.org
---
include/net/red.h | 2 +-
net/802/garp.c | 2 +-
net/openvswitch/actions.c | 2 +-
net/rds/bind.c | 2 +-
net/sctp/socket.c | 2 +-
net/xfrm/xfrm_state.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/net/red.h b/include/net/red.h
index ef46058..168bb2f 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -303,7 +303,7 @@ static inline unsigned long red_calc_qavg(const struct red_parms *p,
static inline u32 red_random(const struct red_parms *p)
{
- return reciprocal_divide(net_random(), p->max_P_reciprocal);
+ return reciprocal_divide(prandom_u32(), p->max_P_reciprocal);
}
static inline int red_mark_probability(const struct red_parms *p,
diff --git a/net/802/garp.c b/net/802/garp.c
index 8456f5d..cf7410d 100644
--- a/net/802/garp.c
+++ b/net/802/garp.c
@@ -397,7 +397,7 @@ static void garp_join_timer_arm(struct garp_applicant *app)
{
unsigned long delay;
- delay = (u64)msecs_to_jiffies(garp_join_time) * net_random() >> 32;
+ delay = (u64)msecs_to_jiffies(garp_join_time) * prandom_u32() >> 32;
mod_timer(&app->join_timer, jiffies + delay);
}
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index ac2defe..257bc36 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -404,7 +404,7 @@ static int sample(struct datapath *dp, struct sk_buff *skb,
a = nla_next(a, &rem)) {
switch (nla_type(a)) {
case OVS_SAMPLE_ATTR_PROBABILITY:
- if (net_random() >= nla_get_u32(a))
+ if (prandom_u32() >= nla_get_u32(a))
return 0;
break;
diff --git a/net/rds/bind.c b/net/rds/bind.c
index 637bde5..7f95f4b 100644
--- a/net/rds/bind.c
+++ b/net/rds/bind.c
@@ -118,7 +118,7 @@ static int rds_add_bound(struct rds_sock *rs, __be32 addr, __be16 *port)
rover = be16_to_cpu(*port);
last = rover;
} else {
- rover = max_t(u16, net_random(), 2);
+ rover = max_t(u16, prandom_u32(), 2);
last = rover - 1;
}
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 9e65758..95860aa 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5899,7 +5899,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
inet_get_local_port_range(&low, &high);
remaining = (high - low) + 1;
- rover = net_random() % remaining + low;
+ rover = prandom_u32() % remaining + low;
do {
rover++;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 3459692..35ddaab 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1546,7 +1546,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
} else {
u32 spi = 0;
for (h=0; h<high-low+1; h++) {
- spi = low + net_random()%(high-low+1);
+ spi = low + prandom_u32() % (high - low + 1);
x0 = xfrm_state_lookup(net, mark, &x->id.daddr, htonl(spi), x->id.proto, x->props.family);
if (x0 = NULL) {
x->id.spi = htonl(spi);
--
1.7.11.7
WARNING: multiple messages have this Message-ID (diff)
From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Jesse Gross <jesse@nicira.com>,
Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>,
Vlad Yasevich <vyasevich@gmail.com>,
Sridhar Samudrala <sri@us.ibm.com>,
Neil Horman <nhorman@tuxdriver.com>,
Steffen Klassert <steffen.klassert@secunet.com>,
Herbert Xu <herbert@gondor.hengli.com.au>,
"David S. Miller" <davem@davemloft.net>,
linux-sctp@vger.kernel.org, dev@openvswitch.org,
netdev@vger.kernel.org
Subject: [PATCH 28/29] net/: rename net_random() to prandom_u32()
Date: Mon, 24 Dec 2012 11:14:15 +0900 [thread overview]
Message-ID: <1356315256-6572-29-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com>
Use more preferable function name which implies using a pseudo-random
number generator.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Jesse Gross <jesse@nicira.com>
Cc: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Sridhar Samudrala <sri@us.ibm.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-sctp@vger.kernel.org
Cc: dev@openvswitch.org
Cc: netdev@vger.kernel.org
---
include/net/red.h | 2 +-
net/802/garp.c | 2 +-
net/openvswitch/actions.c | 2 +-
net/rds/bind.c | 2 +-
net/sctp/socket.c | 2 +-
net/xfrm/xfrm_state.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/net/red.h b/include/net/red.h
index ef46058..168bb2f 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -303,7 +303,7 @@ static inline unsigned long red_calc_qavg(const struct red_parms *p,
static inline u32 red_random(const struct red_parms *p)
{
- return reciprocal_divide(net_random(), p->max_P_reciprocal);
+ return reciprocal_divide(prandom_u32(), p->max_P_reciprocal);
}
static inline int red_mark_probability(const struct red_parms *p,
diff --git a/net/802/garp.c b/net/802/garp.c
index 8456f5d..cf7410d 100644
--- a/net/802/garp.c
+++ b/net/802/garp.c
@@ -397,7 +397,7 @@ static void garp_join_timer_arm(struct garp_applicant *app)
{
unsigned long delay;
- delay = (u64)msecs_to_jiffies(garp_join_time) * net_random() >> 32;
+ delay = (u64)msecs_to_jiffies(garp_join_time) * prandom_u32() >> 32;
mod_timer(&app->join_timer, jiffies + delay);
}
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index ac2defe..257bc36 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -404,7 +404,7 @@ static int sample(struct datapath *dp, struct sk_buff *skb,
a = nla_next(a, &rem)) {
switch (nla_type(a)) {
case OVS_SAMPLE_ATTR_PROBABILITY:
- if (net_random() >= nla_get_u32(a))
+ if (prandom_u32() >= nla_get_u32(a))
return 0;
break;
diff --git a/net/rds/bind.c b/net/rds/bind.c
index 637bde5..7f95f4b 100644
--- a/net/rds/bind.c
+++ b/net/rds/bind.c
@@ -118,7 +118,7 @@ static int rds_add_bound(struct rds_sock *rs, __be32 addr, __be16 *port)
rover = be16_to_cpu(*port);
last = rover;
} else {
- rover = max_t(u16, net_random(), 2);
+ rover = max_t(u16, prandom_u32(), 2);
last = rover - 1;
}
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 9e65758..95860aa 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5899,7 +5899,7 @@ static long sctp_get_port_local(struct sock *sk, union sctp_addr *addr)
inet_get_local_port_range(&low, &high);
remaining = (high - low) + 1;
- rover = net_random() % remaining + low;
+ rover = prandom_u32() % remaining + low;
do {
rover++;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 3459692..35ddaab 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1546,7 +1546,7 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high)
} else {
u32 spi = 0;
for (h=0; h<high-low+1; h++) {
- spi = low + net_random()%(high-low+1);
+ spi = low + prandom_u32() % (high - low + 1);
x0 = xfrm_state_lookup(net, mark, &x->id.daddr, htonl(spi), x->id.proto, x->props.family);
if (x0 == NULL) {
x->id.spi = htonl(spi);
--
1.7.11.7
next prev parent reply other threads:[~2012-12-24 2:14 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-24 2:13 [PATCH 00/29] rename random32 and net_random to prandom Akinobu Mita
2012-12-24 2:13 ` [PATCH 01/29] raid6test: use prandom_bytes() Akinobu Mita
2012-12-24 2:13 ` [PATCH 02/29] uuid: " Akinobu Mita
2012-12-24 2:13 ` [PATCH 03/29] x86: pageattr-test: remove srandom32 call Akinobu Mita
2012-12-24 2:13 ` [PATCH 04/29] x86: rename random32() to prandom_u32() Akinobu Mita
2012-12-24 2:13 ` [PATCH 05/29] lib/: " Akinobu Mita
2012-12-24 2:13 ` [PATCH 06/29] mm/: " Akinobu Mita
2012-12-24 2:13 ` Akinobu Mita
2012-12-24 2:13 ` [PATCH 07/29] kernel/: " Akinobu Mita
2012-12-24 2:13 ` [PATCH 08/29] drbd: " Akinobu Mita
2013-01-13 12:28 ` [Drbd-dev] " Akinobu Mita
[not found] ` <1356315256-6572-1-git-send-email-akinobu.mita-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-12-24 2:13 ` [PATCH 09/29] infiniband: rename random32() and net_random() " Akinobu Mita
2012-12-24 2:13 ` Akinobu Mita
2012-12-24 2:13 ` [PATCH 10/29] mmc: rename random32() " Akinobu Mita
2012-12-24 2:13 ` [PATCH 11/29] video/uvesafb: " Akinobu Mita
2012-12-24 2:13 ` Akinobu Mita
2012-12-24 2:13 ` [PATCH 12/29] xfs: " Akinobu Mita
2012-12-24 2:14 ` [PATCH 13/29] ubifs: " Akinobu Mita
2012-12-24 2:14 ` Akinobu Mita
2012-12-24 2:14 ` [PATCH 14/29] uwb: " Akinobu Mita
2012-12-24 2:14 ` [PATCH 15/29] lguest: " Akinobu Mita
2012-12-24 2:14 ` [PATCH 16/29] scsi: " Akinobu Mita
2012-12-24 2:14 ` [PATCH 17/29] mtd: " Akinobu Mita
2012-12-24 2:14 ` Akinobu Mita
2012-12-24 2:14 ` [PATCH 18/29] drivers/net: " Akinobu Mita
2012-12-24 2:14 ` [B.A.T.M.A.N.] [PATCH 19/29] batman-adv: fix random jitter calculation Akinobu Mita
2012-12-24 2:14 ` Akinobu Mita
2012-12-25 11:26 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-12-25 11:26 ` Antonio Quartulli
2012-12-25 21:35 ` [B.A.T.M.A.N.] " Akinobu Mita
2012-12-25 21:35 ` Akinobu Mita
2012-12-25 21:37 ` [B.A.T.M.A.N.] " David Miller
2012-12-25 21:37 ` David Miller
2012-12-24 2:14 ` [B.A.T.M.A.N.] [PATCH 20/29] batman-adv: rename random32() to prandom_u32() Akinobu Mita
2012-12-24 2:14 ` Akinobu Mita
2012-12-25 11:30 ` [B.A.T.M.A.N.] " Antonio Quartulli
2012-12-25 11:30 ` Antonio Quartulli
2013-01-02 11:52 ` [B.A.T.M.A.N.] " Marek Lindner
2013-01-02 11:52 ` Marek Lindner
2012-12-24 2:14 ` [PATCH 21/29] net/sunrpc: rename random32() and net_random() " Akinobu Mita
2012-12-24 2:14 ` [PATCH 22/29] net/sched: " Akinobu Mita
2012-12-24 2:14 ` [PATCH 23/29] net/ipv4: rename " Akinobu Mita
2012-12-24 2:14 ` [PATCH 24/29] net/ipv6: " Akinobu Mita
2012-12-24 2:14 ` [PATCH 25/29] net/netfilter: rename random32() and " Akinobu Mita
2012-12-24 2:14 ` [PATCH 26/29] net/core: " Akinobu Mita
2012-12-24 2:14 ` [PATCH 27/29] net/core: remove duplicate statements by do-while loop Akinobu Mita
2012-12-24 2:14 ` Akinobu Mita [this message]
2012-12-24 2:14 ` [PATCH 28/29] net/: rename net_random() to prandom_u32() Akinobu Mita
2012-12-25 0:21 ` Neil Horman
2012-12-25 0:21 ` Neil Horman
2012-12-25 11:47 ` Akinobu Mita
2012-12-25 11:47 ` Akinobu Mita
2012-12-26 0:42 ` Neil Horman
2012-12-26 0:42 ` Neil Horman
2012-12-24 2:14 ` [PATCH 29/29] remove unused net_random(), net_srandom(), random32(), and srandom32() Akinobu Mita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356315256-6572-29-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=dev@openvswitch.org \
--cc=herbert@gondor.hengli.com.au \
--cc=jesse@nicira.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=sri@us.ibm.com \
--cc=steffen.klassert@secunet.com \
--cc=venkat.x.venkatsubra@oracle.com \
--cc=vyasevich@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.