|
@@ -7264,12 +7264,10 @@ static int netif_alloc_rx_queues(struct net_device *dev)
|
|
|
|
|
|
BUG_ON(count < 1);
|
|
|
|
|
|
- rx = kzalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
|
|
|
- if (!rx) {
|
|
|
- rx = vzalloc(sz);
|
|
|
- if (!rx)
|
|
|
- return -ENOMEM;
|
|
|
- }
|
|
|
+ rx = kvzalloc(sz, GFP_KERNEL | __GFP_REPEAT);
|
|
|
+ if (!rx)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
dev->_rx = rx;
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
@@ -7306,12 +7304,10 @@ static int netif_alloc_netdev_queues(struct net_device *dev)
|
|
|
if (count < 1 || count > 0xffff)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- tx = kzalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
|
|
|
- if (!tx) {
|
|
|
- tx = vzalloc(sz);
|
|
|
- if (!tx)
|
|
|
- return -ENOMEM;
|
|
|
- }
|
|
|
+ tx = kvzalloc(sz, GFP_KERNEL | __GFP_REPEAT);
|
|
|
+ if (!tx)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
dev->_tx = tx;
|
|
|
|
|
|
netdev_for_each_tx_queue(dev, netdev_init_one_queue, NULL);
|
|
@@ -7845,9 +7841,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
|
|
|
/* ensure 32-byte alignment of whole construct */
|
|
|
alloc_size += NETDEV_ALIGN - 1;
|
|
|
|
|
|
- p = kzalloc(alloc_size, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
|
|
|
- if (!p)
|
|
|
- p = vzalloc(alloc_size);
|
|
|
+ p = kvzalloc(alloc_size, GFP_KERNEL | __GFP_REPEAT);
|
|
|
if (!p)
|
|
|
return NULL;
|
|
|
|