net-sysfs: update the queue counts in the unregistration path

[ Upstream commit d7dac083414eb5bb99a6d2ed53dc2c1b405224e5 ]

When updating Rx and Tx queue kobjects, the queue count should always be
updated to match the queue kobjects count. This was not done in the net
device unregistration path, fix it. Tracking all queue count updates
will allow in a following up patch to detect illegal updates.

Signed-off-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index af591236010557823492f8ae043970344516b0ee..99303897b7bb7683a24c7128831f273d7fb682f1 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1804,6 +1804,9 @@ static void remove_queue_kobjects(struct net_device *dev)
 
        net_rx_queue_update_kobjects(dev, real_rx, 0);
        netdev_queue_update_kobjects(dev, real_tx, 0);
+
+       dev->real_num_rx_queues = 0;
+       dev->real_num_tx_queues = 0;
 #ifdef CONFIG_SYSFS
        kset_unregister(dev->queues_kset);
 #endif