From c7cd51ea5314fbadb573900a3427a79a1f704569 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 02:17:42 -0700
Subject: [PATCH] --- yaml --- r: 90794 b: refs/heads/master c:
 d0498d9ae1a5cebac363e38907266d5cd2eedf89 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d081c5f30ebe..d8f3b76a3ffe 100644
--- 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
index 77530e9a34fc..c16a07fde388 100644
--- 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) {