diff options
| author | Jakub Kicinski | 2018-01-10 10:20:02 +0100 |
|---|---|---|
| committer | Daniel Borkmann | 2018-01-10 12:06:17 +0100 |
| commit | 82aaff2f63443e1d6cc4a186ed9c2a5718123906 (patch) | |
| tree | a6dae59bfd56945e9d909abaef526f62e657853c /net/core/dev.c | |
| parent | net: use the right variant of kfree (diff) | |
| download | kernel-qcow2-linux-82aaff2f63443e1d6cc4a186ed9c2a5718123906.tar.gz kernel-qcow2-linux-82aaff2f63443e1d6cc4a186ed9c2a5718123906.tar.xz kernel-qcow2-linux-82aaff2f63443e1d6cc4a186ed9c2a5718123906.zip | |
net: free RX queue structures
Looks like commit e817f85652c1 ("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: e817f85652c1 ("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>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 852a54c769a3..74e1e5d31337 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7653,16 +7653,15 @@ err_rxq_info: 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, |