Merge tag 'fixes-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner...

[sfrench/cifs-2.6.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 94fff0700bdd34173130d23b153d2bde7f37832e..999b70c59761d8f08429306da0c377d83d8a1b53 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1027,7 +1027,7 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
        while (--i >= new_num) {
                struct kobject *kobj = &dev->_rx[i].kobj;
 
-               if (!refcount_read(&dev_net(dev)->count))
+               if (!refcount_read(&dev_net(dev)->ns.count))
                        kobj->uevent_suppress = 1;
                if (dev->sysfs_rx_queue_group)
                        sysfs_remove_group(kobj, dev->sysfs_rx_queue_group);
@@ -1605,7 +1605,7 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)
        while (--i >= new_num) {
                struct netdev_queue *queue = dev->_tx + i;
 
-               if (!refcount_read(&dev_net(dev)->count))
+               if (!refcount_read(&dev_net(dev)->ns.count))
                        queue->kobj.uevent_suppress = 1;
 #ifdef CONFIG_BQL
                sysfs_remove_group(&queue->kobj, &dql_group);
@@ -1852,7 +1852,7 @@ void netdev_unregister_kobject(struct net_device *ndev)
 {
        struct device *dev = &ndev->dev;
 
-       if (!refcount_read(&dev_net(ndev)->count))
+       if (!refcount_read(&dev_net(ndev)->ns.count))
                dev_set_uevent_suppress(dev, 1);
 
        kobject_get(&dev->kobj);