From 474db77509b994db263831b12537ccf188024a5d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 21 Jul 2008 13:28:44 -0700
Subject: [PATCH] --- yaml --- r: 104874 b: refs/heads/master c:
 7943986ca1138ac99597b1aa4dc893012dcfdc08 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dbccd233643e..150232c9d96a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 847499ce71bdcc8fc542062df6ebed3e596608dd
+refs/heads/master: 7943986ca1138ac99597b1aa4dc893012dcfdc08
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index cbc34c0db376..1698b3998981 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -4207,7 +4207,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
 {
 	struct netdev_queue *tx;
 	struct net_device *dev;
-	int alloc_size;
+	size_t alloc_size;
 	void *p;
 
 	BUG_ON(strlen(name) >= sizeof(dev->name));
@@ -4227,7 +4227,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
 		return NULL;
 	}
 
-	tx = kzalloc(sizeof(struct netdev_queue) * queue_count, GFP_KERNEL);
+	tx = kcalloc(queue_count, sizeof(struct netdev_queue), GFP_KERNEL);
 	if (!tx) {
 		printk(KERN_ERR "alloc_netdev: Unable to allocate "
 		       "tx qdiscs.\n");