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

Commit 148989d8 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-xdp-rxq-fixes' 



Jakub Kicinski says:

====================
Two more trivial fixes to the recent XDP RXQ series.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 5896351e 82aaff2f

net/core/dev.c

+4 −5
Original line number Diff line number Diff line
@@ -7645,7 +7645,7 @@ static int netif_alloc_rx_queues(struct net_device *dev) 
	/* Rollback successful reg's and free other resources */

	while (i--)

		xdp_rxq_info_unreg(&rx[i].xdp_rxq);

	kfree(dev->_rx);

	kvfree(dev->_rx);

	dev->_rx = NULL;

	return err;

}
@@ -7653,16 +7653,15 @@ static int netif_alloc_rx_queues(struct net_device *dev) 
static void netif_free_rx_queues(struct net_device *dev)

{

	unsigned int i, count = dev->num_rx_queues;

	struct netdev_rx_queue *rx;



	/* netif_alloc_rx_queues alloc failed, resources have been unreg'ed */

	if (!dev->_rx)

		return;



	rx = dev->_rx;



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

		xdp_rxq_info_unreg(&rx[i].xdp_rxq);

		xdp_rxq_info_unreg(&dev->_rx[i].xdp_rxq);



	kvfree(dev->_rx);

}



static void netdev_init_one_queue(struct net_device *dev,