leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: free RX queue structures

Browse Source 
Looks like commit e817f85652 ("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: e817f85652 ("xdp: generic XDP handling of xdp_rxq_info")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Jakub Kicinski
2018-01-10 01:20:02 -08:00
committed by Daniel Borkmann
parent 141b52a98a
commit 82aaff2f63
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/dev.c
View File

@@ -7653,16 +7653,15 @@ err_rxq_info:
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,