From patchwork Thu Jan 3 12:19:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 209235 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 9C4D32C007B for ; Thu, 3 Jan 2013 23:22:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753606Ab3ACMVe (ORCPT ); Thu, 3 Jan 2013 07:21:34 -0500 Received: from mail-da0-f41.google.com ([209.85.210.41]:51630 "EHLO mail-da0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753535Ab3ACMUa (ORCPT ); Thu, 3 Jan 2013 07:20:30 -0500 Received: by mail-da0-f41.google.com with SMTP id e20so7002473dak.28 for ; Thu, 03 Jan 2013 04:20:30 -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=1vZGtyAaU975XAMrAu+0/GDl8J8sxOqlpjbQjbeSZ9Y=; b=MWFQe17oiNHqW3CLSiAe3Iz0xHq1RMVrQOlxoenIQ7LyFXLhN596ZB34UXScqRjB/5 XbS40iFBc6ybXKocjf+5t0lGyEsVSTS0s+reKxXWEmEyTam/wK43WJ6WZi4F68Uky4dy KCxlu84ph9D5f4yWRTY4OUiRTbRXJ9YFQZE/ioBhRd4slBNA8au+Va2jqjG1WewHU86E 8d58pPKFKUF9JsZpTcwQqmHRrIQrQYvvhgXqm8mQP24GHUOPDyrNEhb0dO6T++B8rpzS KSlljKZazyQBjN0gH39BJr63fLzEDpfuODpO7sxcqPThi8N705b2Sqj/VwoZUgzanHHj yRAQ== X-Received: by 10.66.78.100 with SMTP id a4mr145680402pax.4.1357215630402; Thu, 03 Jan 2013 04:20:30 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id qn3sm28095334pbb.56.2013.01.03.04.20.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Jan 2013 04:20:29 -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 -v2 25/26] net: rename random32 to prandom Date: Thu, 3 Jan 2013 21:19:21 +0900 Message-Id: <1357215562-6288-26-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357215562-6288-1-git-send-email-akinobu.mita@gmail.com> References: <1357215562-6288-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 --- * New patch 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);