summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2013-04-29 16:21:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:44 -0700
commit8d564368a9a3197f43e56dadf4a18c5738849f94 (patch)
treedeafd4e12d9edfdf45a808fad29854be6a30f257
parent70e3ba72ba9afd4ec28ab09f6a27aac00c30b358 (diff)
downloadlinux-3.10-8d564368a9a3197f43e56dadf4a18c5738849f94.tar.gz
linux-3.10-8d564368a9a3197f43e56dadf4a18c5738849f94.tar.bz2
linux-3.10-8d564368a9a3197f43e56dadf4a18c5738849f94.zip
net: rename random32 to prandom
Commit 496f2f93b1cc ("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 <akinobu.mita@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/net.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/net.h b/include/linux/net.h
index aa1673160a4..99c9f0c103c 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);