1 files changed, 7 insertions, 6 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index e42a97b5b97..b110a8a242d 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -176,7 +176,7 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
         if (!(rdev->wiphy.flags & WIPHY_FLAG_NETNS_OK))
                 return -EOPNOTSUPP;
 
-        list_for_each_entry(wdev, &rdev->netdev_list, list) {
+        list_for_each_entry(wdev, &rdev->wdev_list, list) {
                 wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
                 err = dev_change_net_namespace(wdev->netdev, net, "wlan%d");
                 if (err)
@@ -188,7 +188,7 @@ int cfg80211_switch_netns(struct cfg80211_registered_device *rdev,
                 /* failed -- clean up to old netns */
                 net = wiphy_net(&rdev->wiphy);
 
-                list_for_each_entry_continue_reverse(wdev, &rdev->netdev_list,
+                list_for_each_entry_continue_reverse(wdev, &rdev->wdev_list,
                                                      list) {
                         wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
                         err = dev_change_net_namespace(wdev->netdev, net,
@@ -226,7 +226,7 @@ static int cfg80211_rfkill_set_block(void *data, bool blocked)
         rtnl_lock();
         mutex_lock(&rdev->devlist_mtx);
 
-        list_for_each_entry(wdev, &rdev->netdev_list, list)
+        list_for_each_entry(wdev, &rdev->wdev_list, list)
                 dev_close(wdev->netdev);
 
         mutex_unlock(&rdev->devlist_mtx);
@@ -304,7 +304,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
         mutex_init(&rdev->mtx);
         mutex_init(&rdev->devlist_mtx);
         mutex_init(&rdev->sched_scan_mtx);
-        INIT_LIST_HEAD(&rdev->netdev_list);
+        INIT_LIST_HEAD(&rdev->wdev_list);
         spin_lock_init(&rdev->bss_lock);
         INIT_LIST_HEAD(&rdev->bss_list);
         INIT_WORK(&rdev->scan_done_wk, __cfg80211_scan_done);
@@ -622,7 +622,7 @@ void wiphy_unregister(struct wiphy *wiphy)
                 __count == 0; }));
 
         mutex_lock(&rdev->devlist_mtx);
-        BUG_ON(!list_empty(&rdev->netdev_list));
+        BUG_ON(!list_empty(&rdev->wdev_list));
         mutex_unlock(&rdev->devlist_mtx);
 
         /*
@@ -821,7 +821,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                 spin_lock_init(&wdev->mgmt_registrations_lock);
 
                 mutex_lock(&rdev->devlist_mtx);
-                list_add_rcu(&wdev->list, &rdev->netdev_list);
+                wdev->identifier = ++rdev->wdev_id;
+                list_add_rcu(&wdev->list, &rdev->wdev_list);
                 rdev->devlist_generation++;
                 /* can only change netns with wiphy */
                 dev->features |= NETIF_F_NETNS_LOCAL;