From 578abba463e78e48f44cbc57b30cadef64f1f002 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Fri, 2 Dec 2011 12:36:13 +0000
Subject: [PATCH] --- yaml --- r: 278343 b: refs/heads/master c:
 c2e4e25afcc8ae1835a6100089f1f9fd3a362430 h: refs/heads/master i:   278341:
 ea0a75c0fa80d27c618272ce6b0b7178ecf8e287   278339:
 3dcc2f0a1179d56deb13ef5b98d56858dd04588b   278335:
 2792e9984619bb0437d32ddaccf1388be301da60 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/ethernet/sfc/rx.c       | 2 +-
 trunk/drivers/net/ethernet/sfc/selftest.c | 4 ++--
 trunk/drivers/net/ethernet/sfc/tx.c       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d4a3f43543f8..89bba7ee2253 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddf98e6d30a966dbd6e675c90e2caa5b9486e519
+refs/heads/master: c2e4e25afcc8ae1835a6100089f1f9fd3a362430
diff --git a/trunk/drivers/net/ethernet/sfc/rx.c b/trunk/drivers/net/ethernet/sfc/rx.c
index 752d521c09b1..955b14956deb 100644
--- a/trunk/drivers/net/ethernet/sfc/rx.c
+++ b/trunk/drivers/net/ethernet/sfc/rx.c
@@ -669,7 +669,7 @@ int efx_probe_rx_queue(struct efx_rx_queue *rx_queue)
 		  rx_queue->ptr_mask);
 
 	/* Allocate RX buffers */
-	rx_queue->buffer = kzalloc(entries * sizeof(*rx_queue->buffer),
+	rx_queue->buffer = kcalloc(entries, sizeof(*rx_queue->buffer),
 				   GFP_KERNEL);
 	if (!rx_queue->buffer)
 		return -ENOMEM;
diff --git a/trunk/drivers/net/ethernet/sfc/selftest.c b/trunk/drivers/net/ethernet/sfc/selftest.c
index 822f6c2a6a7c..52edd24fcde3 100644
--- a/trunk/drivers/net/ethernet/sfc/selftest.c
+++ b/trunk/drivers/net/ethernet/sfc/selftest.c
@@ -503,8 +503,8 @@ efx_test_loopback(struct efx_tx_queue *tx_queue,
 		/* Determine how many packets to send */
 		state->packet_count = efx->txq_entries / 3;
 		state->packet_count = min(1 << (i << 2), state->packet_count);
-		state->skbs = kzalloc(sizeof(state->skbs[0]) *
-				      state->packet_count, GFP_KERNEL);
+		state->skbs = kcalloc(state->packet_count,
+				      sizeof(state->skbs[0]), GFP_KERNEL);
 		if (!state->skbs)
 			return -ENOMEM;
 		state->flush = false;
diff --git a/trunk/drivers/net/ethernet/sfc/tx.c b/trunk/drivers/net/ethernet/sfc/tx.c
index e0e00b3d6a82..72f0fbc73b1a 100644
--- a/trunk/drivers/net/ethernet/sfc/tx.c
+++ b/trunk/drivers/net/ethernet/sfc/tx.c
@@ -479,7 +479,7 @@ int efx_probe_tx_queue(struct efx_tx_queue *tx_queue)
 		  tx_queue->queue, efx->txq_entries, tx_queue->ptr_mask);
 
 	/* Allocate software ring */
-	tx_queue->buffer = kzalloc(entries * sizeof(*tx_queue->buffer),
+	tx_queue->buffer = kcalloc(entries, sizeof(*tx_queue->buffer),
 				   GFP_KERNEL);
 	if (!tx_queue->buffer)
 		return -ENOMEM;