Commit 82aaff2f authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann

net: free RX queue structures

Looks like commit e817f856 ("xdp: generic XDP handling of
xdp_rxq_info") replaced kvfree(dev->_rx) in free_netdev() with
a call to netif_free_rx_queues() which doesn't actually free
the rings?

While at it remove the unnecessary temporary variable.

Fixes: e817f856 ("xdp: generic XDP handling of xdp_rxq_info")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 141b52a9
...@@ -7653,16 +7653,15 @@ static int netif_alloc_rx_queues(struct net_device *dev) ...@@ -7653,16 +7653,15 @@ static int netif_alloc_rx_queues(struct net_device *dev)
static void netif_free_rx_queues(struct net_device *dev) static void netif_free_rx_queues(struct net_device *dev)
{ {
unsigned int i, count = dev->num_rx_queues; unsigned int i, count = dev->num_rx_queues;
struct netdev_rx_queue *rx;
/* netif_alloc_rx_queues alloc failed, resources have been unreg'ed */ /* netif_alloc_rx_queues alloc failed, resources have been unreg'ed */
if (!dev->_rx) if (!dev->_rx)
return; return;
rx = dev->_rx;
for (i = 0; i < count; i++) 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, static void netdev_init_one_queue(struct net_device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment