Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd25fa7b authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: cleanups in RX queue allocation 



Clean up in RX queue allocation.  In netif_set_real_num_rx_queues
return error on attempt to set zero queues, or requested number is
greater than number of allocated queues.  In netif_alloc_rx_queues,
do BUG_ON if queue_count is zero.

Signed-off-by: default avatarTom Herbert <therbert@google.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55513fb4

net/core/dev.c

+17 −19
Original line number Diff line number Diff line
@@ -1583,12 +1583,12 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq) 
{

	int rc;



	if (rxq < 1 || rxq > dev->num_rx_queues)

		return -EINVAL;



	if (dev->reg_state == NETREG_REGISTERED) {

		ASSERT_RTNL();



		if (rxq > dev->num_rx_queues)

			return -EINVAL;



		rc = net_rx_queue_update_kobjects(dev, dev->real_num_rx_queues,

						  rxq);

		if (rc)
@@ -5013,14 +5013,13 @@ static int netif_alloc_rx_queues(struct net_device *dev) 
{

#ifdef CONFIG_RPS

	unsigned int i, count = dev->num_rx_queues;



	if (count) {

	struct netdev_rx_queue *rx;



	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);

		pr_err("netdev: Unable to allocate %u rx queues.\n", count);

		return -ENOMEM;

	}

	dev->_rx = rx;
@@ -5031,7 +5030,6 @@ static int netif_alloc_rx_queues(struct net_device *dev) 
	 */

	for (i = 0; i < count; i++)

		rx[i].first = rx;

	}

#endif

	return 0;

}