From 83ea7c16e67b102b1805cdd4e7cee06f91cff10c Mon Sep 17 00:00:00 2001
From: Tom Herbert <therbert@google.com>
Date: Mon, 18 Oct 2010 17:55:58 +0000
Subject: [PATCH] --- yaml --- r: 215370 b: refs/heads/master c:
 55513fb4281464e97aa1ff2b9c906ca5aed917c5 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d5273d4f1a09..5f8aa30ea586 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eeaa2db162f1f6d83e988d4d28f4ba7be600e44
+refs/heads/master: 55513fb4281464e97aa1ff2b9c906ca5aed917c5
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 04972a4783e2..f44d29ae5d67 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -5511,6 +5511,12 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
 
 	BUG_ON(strlen(name) >= sizeof(dev->name));
 
+	if (queue_count < 1) {
+		pr_err("alloc_netdev: Unable to allocate device "
+		       "with zero queues.\n");
+		return NULL;
+	}
+
 	alloc_size = sizeof(struct net_device);
 	if (sizeof_priv) {
 		/* ensure 32-byte alignment of private area */