---

yaml --- r: 90794 b: refs/heads/master c: d0498d9 h: refs/heads/master v: v3
git-mirror · Apr 16, 2008 · c7cd51e · c7cd51e
1 parent 5704fa6
commit c7cd51e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3005d7f4abe03ad41af33b1548602cd086d86a2
+refs/heads/master: d0498d9ae1a5cebac363e38907266d5cd2eedf89
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -4000,7 +4000,8 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
 	alloc_size = (sizeof(*dev) + NETDEV_ALIGN_CONST +
 		     (sizeof(struct net_device_subqueue) * (queue_count - 1))) &
 		     ~NETDEV_ALIGN_CONST;
-	alloc_size += sizeof_priv + NETDEV_ALIGN_CONST;
+	if (sizeof_priv)
+		alloc_size += sizeof_priv + NETDEV_ALIGN_CONST;
 
 	p = kzalloc(alloc_size, GFP_KERNEL);
 	if (!p) {