---

yaml --- r: 215370 b: refs/heads/master c: 55513fb h: refs/heads/master v: v3
git-mirror · Oct 20, 2010 · 83ea7c1 · 83ea7c1
1 parent d0e51c8
commit 83ea7c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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 */