From da094e1ec00cab03ef027c99751d003bb071b77b Mon Sep 17 00:00:00 2001
From: Yan Burman <burman.yan@gmail.com>
Date: Tue, 12 Dec 2006 20:03:10 +0100
Subject: [PATCH] --- yaml --- r: 44377 b: refs/heads/master c:
 c48e3fca3f063edb0c8c4d163e880b94c1d9f93d h: refs/heads/master i:   44375:
 e2d65ad77776b4b77af7782664b9a064ca89ceda v: v3

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

diff --git a/[refs] b/[refs]
index f442c5077025..1be68792dcc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0268bd0a807fc5cc41ced9cce95efe1b43e8fa52
+refs/heads/master: c48e3fca3f063edb0c8c4d163e880b94c1d9f93d
diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c
index 03bf164f9e8d..c2ae2a24629b 100644
--- a/trunk/drivers/net/e100.c
+++ b/trunk/drivers/net/e100.c
@@ -1930,9 +1930,8 @@ static int e100_rx_alloc_list(struct nic *nic)
 	nic->rx_to_use = nic->rx_to_clean = NULL;
 	nic->ru_running = RU_UNINITIALIZED;
 
-	if(!(nic->rxs = kmalloc(sizeof(struct rx) * count, GFP_ATOMIC)))
+	if(!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
 		return -ENOMEM;
-	memset(nic->rxs, 0, sizeof(struct rx) * count);
 
 	for(rx = nic->rxs, i = 0; i < count; rx++, i++) {
 		rx->next = (i + 1 < count) ? rx + 1 : nic->rxs;