mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
Merge branch 'bpf-xdp-rxq-fixes'
Jakub Kicinski says: ==================== Two more trivial fixes to the recent XDP RXQ series. ==================== Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
commit
148989d8ba
1 changed files with 4 additions and 5 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue