Skip to content

Commit

Permalink
net: Move TX queue allocation to alloc_netdev_mq
Browse files Browse the repository at this point in the history
TX queues are now allocated in alloc_netdev_mq and freed in
free_netdev.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Tom Herbert authored and David S. Miller committed Nov 15, 2010
1 parent cc9ff19 commit ed9af2e
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -5136,10 +5136,6 @@ int register_netdevice(struct net_device *dev)
if (ret)
goto out;

ret = netif_alloc_netdev_queues(dev);
if (ret)
goto out;

netdev_init_queues(dev);

/* Init, if this function is available */
Expand Down Expand Up @@ -5599,6 +5595,8 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,

dev->num_tx_queues = queue_count;
dev->real_num_tx_queues = queue_count;
if (netif_alloc_netdev_queues(dev))
goto free_pcpu;

#ifdef CONFIG_RPS
dev->num_rx_queues = queue_count;
Expand All @@ -5619,6 +5617,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,

free_pcpu:
free_percpu(dev->pcpu_refcnt);
kfree(dev->_tx);
free_p:
kfree(p);
return NULL;
Expand Down

0 comments on commit ed9af2e

Please sign in to comment.