From patchwork Mon Dec 24 02:14:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 208003 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CFB7F2C0084 for ; Mon, 24 Dec 2012 13:16:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753091Ab2LXCPi (ORCPT ); Sun, 23 Dec 2012 21:15:38 -0500 Received: from mail-da0-f54.google.com ([209.85.210.54]:38295 "EHLO mail-da0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752924Ab2LXCPc (ORCPT ); Sun, 23 Dec 2012 21:15:32 -0500 Received: by mail-da0-f54.google.com with SMTP id n2so2941470dad.27 for ; Sun, 23 Dec 2012 18:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=cPaztwGmYEDdivp2HXHLfbHfGrCgwYYlhGL4gtWcBl8=; b=S4N1/vudjaNOx0dmREpIvyj1PrLWZpFKm7Ye2QfjBGj9emnuHuilg2+hm5E4dnLwaa 5Z/JPf3NOTmA62eRhT4bK5xMIZtx2YZ0m+y+gE06tlk2FUSmAWeR2RhA8PxXbeYPai4b yvAhWxB8jZmxoJsVcn6CYxzrp99ZOO7imHsUF1TqwrbGeR9Fgl83BUg8JZ6Hbqrg2d4n GEMgr0MmlTRwG4HVm+61Z1gMk1tPId7yRf0jrzID88oeDJFtE+Rf8w6iQQcfR/hdDieG KiRq+5gdcykn3TsUZndsGhdZSxEJoOUTpNnYZTdfC/8Ie+hacSvAwDCb8lV+vYOWoujp gQ0A== X-Received: by 10.68.240.36 with SMTP id vx4mr62304927pbc.90.1356315331864; Sun, 23 Dec 2012 18:15:31 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id wr4sm11379909pbc.72.2012.12.23.18.15.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 18:15:31 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , Jesse Gross , Venkat Venkatsubra , Vlad Yasevich , Sridhar Samudrala , Neil Horman , Steffen Klassert , Herbert Xu , "David S. Miller" , 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 Message-Id: <1356315256-6572-29-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com> References: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use more preferable function name which implies using a pseudo-random number generator. Signed-off-by: Akinobu Mita Cc: Jesse Gross Cc: Venkat Venkatsubra Cc: Vlad Yasevich Cc: Sridhar Samudrala Cc: Neil Horman Cc: Steffen Klassert Cc: Herbert Xu Cc: "David S. Miller" 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; hid.daddr, htonl(spi), x->id.proto, x->props.family); if (x0 == NULL) { x->id.spi = htonl(spi);