|
@@ -5958,10 +5958,9 @@ static int netif_alloc_rx_queues(struct net_device *dev)
|
|
|
BUG_ON(count < 1);
|
|
|
|
|
|
rx = kcalloc(count, sizeof(struct netdev_rx_queue), GFP_KERNEL);
|
|
|
- if (!rx) {
|
|
|
- pr_err("netdev: Unable to allocate %u rx queues\n", count);
|
|
|
+ if (!rx)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
+
|
|
|
dev->_rx = rx;
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
@@ -5992,10 +5991,9 @@ static int netif_alloc_netdev_queues(struct net_device *dev)
|
|
|
BUG_ON(count < 1);
|
|
|
|
|
|
tx = kcalloc(count, sizeof(struct netdev_queue), GFP_KERNEL);
|
|
|
- if (!tx) {
|
|
|
- pr_err("netdev: Unable to allocate %u tx queues\n", count);
|
|
|
+ if (!tx)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
+
|
|
|
dev->_tx = tx;
|
|
|
|
|
|
netdev_for_each_tx_queue(dev, netdev_init_one_queue, NULL);
|
|
@@ -6482,10 +6480,8 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
|
|
|
alloc_size += NETDEV_ALIGN - 1;
|
|
|
|
|
|
p = kzalloc(alloc_size, GFP_KERNEL);
|
|
|
- if (!p) {
|
|
|
- pr_err("alloc_netdev: Unable to allocate device\n");
|
|
|
+ if (!p)
|
|
|
return NULL;
|
|
|
- }
|
|
|
|
|
|
dev = PTR_ALIGN(p, NETDEV_ALIGN);
|
|
|
dev->padded = (char *)dev - (char *)p;
|