From patchwork Mon Mar 4 12:58:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 224715 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 0220C2C0311 for ; Tue, 5 Mar 2013 00:01:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758210Ab3CDNAH (ORCPT ); Mon, 4 Mar 2013 08:00:07 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:63715 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758119Ab3CDNAF (ORCPT ); Mon, 4 Mar 2013 08:00:05 -0500 Received: by mail-pa0-f50.google.com with SMTP id fa11so3115001pad.23 for ; Mon, 04 Mar 2013 05:00:04 -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=M3HhutE602933eLYEGdsDxAJoGV6fE6XmC/ExLhn/NY=; b=vVBJIbNJ5jWTDRYfGdYm6UQmc7V0vsuqfNKp2RcNyNYzw41a45TLtpUQ5O0pN/di8V g9lG+FEKWTl7fNk89FmAqBnX8uU/J3Ld76Ul8JeQr67AgQpegXHZtkxQ+ggeGtnvCbM+ 8w7LQCVj+7mGeJn6LyMYzQWvK0YCgGCOGEMaRdpaVvvhkuU4YphFe+JzGNXYXEVpPout fmHKouQln2rnIlBc8/jbAEia4Ej+9Qi5nUvWpFuQBXYk5xfQkCiF1lnudXCeVB3IMzGj R+m3XyAMuxxi++PKuryqMmlsst5jRNGEU0Wt4Quf+qUYugNmIOivkVDa+lP1TwArgGwY 5DxA== X-Received: by 10.66.164.164 with SMTP id yr4mr10092291pab.202.1362402004774; Mon, 04 Mar 2013 05:00:04 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id t6sm23836060paz.11.2013.03.04.04.59.59 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Mar 2013 05:00:02 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH -v3 22/23] net: rename random32 to prandom Date: Mon, 4 Mar 2013 21:58:30 +0900 Message-Id: <1362401911-14074-23-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362401911-14074-1-git-send-email-akinobu.mita@gmail.com> References: <1362401911-14074-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 Commit 496f2f93b1cc286f5a4f4f9acdc1e5314978683f ("random32: rename random32 to prandom") renamed random32() and srandom32() to prandom_u32() and prandom_seed() respectively. net_random() and net_srandom() need to be redefined with prandom_* in order to finish the naming transition. While I'm at it, enclose macro argument of net_srandom() with parenthesis. Signed-off-by: Akinobu Mita Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- No change from v2 include/linux/net.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/net.h b/include/linux/net.h index aa16731..99c9f0c 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -240,8 +240,8 @@ do { \ #define net_dbg_ratelimited(fmt, ...) \ net_ratelimited_function(pr_debug, fmt, ##__VA_ARGS__) -#define net_random() random32() -#define net_srandom(seed) srandom32((__force u32)seed) +#define net_random() prandom_u32() +#define net_srandom(seed) prandom_seed((__force u32)(seed)) extern int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec, size_t num, size_t len);