From 86019af0398bfd476c477aabb45683a792119238 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Wed, 13 Jul 2011 17:24:17 +0000
Subject: [PATCH] --- yaml --- r: 256291 b: refs/heads/master c:
 973e574e26cc8f4704e5d7f112fd566386e37f04 h: refs/heads/master i:   256289:
 ea10b2ccb70fe288e83bf4d2aac14b6f4a0ec818   256287:
 08583307f90338a0d5a8f542048462a3a996336f v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/cnic.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3959a2610b1..83e69d16a162 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10d1e8ca8d7136111641472e9800775205ef5a0f
+refs/heads/master: 973e574e26cc8f4704e5d7f112fd566386e37f04
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
index 5533b1526b1b..23d6108c64c6 100644
--- a/trunk/drivers/net/cnic.c
+++ b/trunk/drivers/net/cnic.c
@@ -28,6 +28,7 @@
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/prefetch.h>
+#include <linux/random.h>
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define BCM_VLAN 1
 #endif
@@ -3830,7 +3831,7 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)
 	if (!cp->csk_tbl)
 		return -ENOMEM;
 
-	get_random_bytes(&port_id, sizeof(port_id));
+	port_id = random32();
 	port_id %= CNIC_LOCAL_PORT_RANGE;
 	if (cnic_init_id_tbl(&cp->csk_port_tbl, CNIC_LOCAL_PORT_RANGE,
 			     CNIC_LOCAL_PORT_MIN, port_id)) {
@@ -3890,7 +3891,7 @@ static int cnic_cm_init_bnx2_hw(struct cnic_dev *dev)
 {
 	u32 seed;
 
-	get_random_bytes(&seed, 4);
+	seed = random32();
 	cnic_ctx_wr(dev, 45, 0, seed);
 	return 0;
 }