diff options
| author |   Tom Herbert <therbert@google.com> | 2010-10-18 17:55:58 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-10-20 02:27:58 -0700 |
| commit | 55513fb4281464e97aa1ff2b9c906ca5aed917c5 (patch) | |
| tree | d90d3ea475c0d2b1f00e8b662d112c3c608f3a7c /net/core/dev.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (diff) | |
| download | linux-dev-55513fb4281464e97aa1ff2b9c906ca5aed917c5.tar.xz linux-dev-55513fb4281464e97aa1ff2b9c906ca5aed917c5.zip | |
net: fail alloc_netdev_mq if queue count < 1
In alloc_netdev_mq fail if requested queue_count < 1.
Signed-off-by: Tom Herbert <therbert@google.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 04972a4783e2..f44d29ae5d67 100644 --- a/net/core/dev.c +++ b/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 */ |