1 files changed, 57 insertions, 77 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index a87d43552974..31b40cc4a9c3 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -96,69 +96,6 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
         return &rdev->wiphy;
 }
 
-/* requires cfg80211_mutex to be held! */
-struct cfg80211_registered_device *
-__cfg80211_rdev_from_info(struct genl_info *info)
-{
-        int ifindex;
-        struct cfg80211_registered_device *bywiphyidx = NULL, *byifidx = NULL;
-        struct net_device *dev;
-        int err = -EINVAL;
-
-        assert_cfg80211_lock();
-
-        if (info->attrs[NL80211_ATTR_WIPHY]) {
-                bywiphyidx = cfg80211_rdev_by_wiphy_idx(
-                                nla_get_u32(info->attrs[NL80211_ATTR_WIPHY]));
-                err = -ENODEV;
-        }
-
-        if (info->attrs[NL80211_ATTR_IFINDEX]) {
-                ifindex = nla_get_u32(info->attrs[NL80211_ATTR_IFINDEX]);
-                dev = dev_get_by_index(genl_info_net(info), ifindex);
-                if (dev) {
-                        if (dev->ieee80211_ptr)
-                                byifidx =
-                                        wiphy_to_dev(dev->ieee80211_ptr->wiphy);
-                        dev_put(dev);
-                }
-                err = -ENODEV;
-        }
-
-        if (bywiphyidx && byifidx) {
-                if (bywiphyidx != byifidx)
-                        return ERR_PTR(-EINVAL);
-                else
-                        return bywiphyidx; /* == byifidx */
-        }
-        if (bywiphyidx)
-                return bywiphyidx;
-
-        if (byifidx)
-                return byifidx;
-
-        return ERR_PTR(err);
-}
-
-struct cfg80211_registered_device *
-cfg80211_get_dev_from_info(struct genl_info *info)
-{
-        struct cfg80211_registered_device *rdev;
-
-        mutex_lock(&cfg80211_mutex);
-        rdev = __cfg80211_rdev_from_info(info);
-
-        /* if it is not an error we grab the lock on
-         * it to assure it won't be going away while
-         * we operate on it */
-        if (!IS_ERR(rdev))
-                mutex_lock(&rdev->mtx);
-
-        mutex_unlock(&cfg80211_mutex);
-
-        return rdev;
-}
-
 struct cfg80211_registered_device *
 cfg80211_get_dev_from_ifindex(struct net *net, int ifindex)
 {
@@ -239,7 +176,9 @@ 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) {
+                if (!wdev->netdev)
+                        continue;
                 wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
                 err = dev_change_net_namespace(wdev->netdev, net, "wlan%d");
                 if (err)
@@ -251,8 +190,10 @@ 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) {
+                        if (!wdev->netdev)
+                                continue;
                         wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
                         err = dev_change_net_namespace(wdev->netdev, net,
                                                         "wlan%d");
@@ -289,8 +230,9 @@ 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)
-                dev_close(wdev->netdev);
+        list_for_each_entry(wdev, &rdev->wdev_list, list)
+                if (wdev->netdev)
+                        dev_close(wdev->netdev);
 
         mutex_unlock(&rdev->devlist_mtx);
         rtnl_unlock();
@@ -367,7 +309,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);
@@ -436,6 +378,14 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
                 if (WARN_ON(!c->num_different_channels))
                         return -EINVAL;
 
+                /*
+                 * Put a sane limit on maximum number of different
+                 * channels to simplify channel accounting code.
+                 */
+                if (WARN_ON(c->num_different_channels >
+                                CFG80211_MAX_NUM_DIFFERENT_CHANNELS))
+                        return -EINVAL;
+
                 if (WARN_ON(!c->n_limits))
                         return -EINVAL;
 
@@ -484,9 +434,11 @@ int wiphy_register(struct wiphy *wiphy)
         int i;
         u16 ifmodes = wiphy->interface_modes;
 
+#ifdef CONFIG_PM
         if (WARN_ON((wiphy->wowlan.flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&
                     !(wiphy->wowlan.flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY)))
                 return -EINVAL;
+#endif
 
         if (WARN_ON(wiphy->ap_sme_capa &&
                     !(wiphy->flags & WIPHY_FLAG_HAVE_AP_SME)))
@@ -521,8 +473,14 @@ int wiphy_register(struct wiphy *wiphy)
                         continue;
 
                 sband->band = band;
-
-                if (WARN_ON(!sband->n_channels || !sband->n_bitrates))
+                if (WARN_ON(!sband->n_channels))
+                        return -EINVAL;
+                /*
+                 * on 60gHz band, there are no legacy rates, so
+                 * n_bitrates is 0
+                 */
+                if (WARN_ON(band != IEEE80211_BAND_60GHZ &&
+                            !sband->n_bitrates))
                         return -EINVAL;
 
                 /*
@@ -563,12 +521,14 @@ int wiphy_register(struct wiphy *wiphy)
                 return -EINVAL;
         }
 
+#ifdef CONFIG_PM
         if (rdev->wiphy.wowlan.n_patterns) {
                 if (WARN_ON(!rdev->wiphy.wowlan.pattern_min_len ||
                             rdev->wiphy.wowlan.pattern_min_len >
                             rdev->wiphy.wowlan.pattern_max_len))
                         return -EINVAL;
         }
+#endif
 
         /* check and set up bitrates */
         ieee80211_set_bitrate_flags(wiphy);
@@ -582,7 +542,7 @@ int wiphy_register(struct wiphy *wiphy)
         }
 
         /* set up regulatory info */
-        regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
+        wiphy_regulatory_register(wiphy);
 
         list_add_rcu(&rdev->list, &cfg80211_rdev_list);
         cfg80211_rdev_list_generation++;
@@ -667,7 +627,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);
 
         /*
@@ -692,9 +652,11 @@ void wiphy_unregister(struct wiphy *wiphy)
         /* nothing */
         cfg80211_unlock_rdev(rdev);
 
-        /* If this device got a regulatory hint tell core its
-         * free to listen now to a new shiny device regulatory hint */
-        reg_device_remove(wiphy);
+        /*
+         * If this device got a regulatory hint tell core its
+         * free to listen now to a new shiny device regulatory hint
+         */
+        wiphy_regulatory_deregister(wiphy);
 
         cfg80211_rdev_list_generation++;
         device_del(&rdev->wiphy.dev);
@@ -748,7 +710,7 @@ static void wdev_cleanup_work(struct work_struct *work)
 
         cfg80211_lock_rdev(rdev);
 
-        if (WARN_ON(rdev->scan_req && rdev->scan_req->dev == wdev->netdev)) {
+        if (WARN_ON(rdev->scan_req && rdev->scan_req->wdev == wdev)) {
                 rdev->scan_req->aborted = true;
                 ___cfg80211_scan_done(rdev, true);
         }
@@ -776,6 +738,16 @@ static struct device_type wiphy_type = {
         .name   = "wlan",
 };
 
+void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
+                               enum nl80211_iftype iftype, int num)
+{
+        ASSERT_RTNL();
+
+        rdev->num_running_ifaces += num;
+        if (iftype == NL80211_IFTYPE_MONITOR)
+                rdev->num_running_monitor_ifaces += num;
+}
+
 static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                                          unsigned long state,
                                          void *ndev)
@@ -810,7 +782,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;
@@ -869,12 +842,16 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                 case NL80211_IFTYPE_MESH_POINT:
                         cfg80211_leave_mesh(rdev, dev);
                         break;
+                case NL80211_IFTYPE_AP:
+                        cfg80211_stop_ap(rdev, dev);
+                        break;
                 default:
                         break;
                 }
                 wdev->beacon_interval = 0;
                 break;
         case NETDEV_DOWN:
+                cfg80211_update_iface_num(rdev, wdev->iftype, -1);
                 dev_hold(dev);
                 queue_work(cfg80211_wq, &wdev->cleanup_work);
                 break;
@@ -891,6 +868,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                         mutex_unlock(&rdev->devlist_mtx);
                         dev_put(dev);
                 }
+                cfg80211_update_iface_num(rdev, wdev->iftype, 1);
                 cfg80211_lock_rdev(rdev);
                 mutex_lock(&rdev->devlist_mtx);
                 wdev_lock(wdev);
@@ -980,7 +958,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                         return notifier_from_errno(-EOPNOTSUPP);
                 if (rfkill_blocked(rdev->rfkill))
                         return notifier_from_errno(-ERFKILL);
+                mutex_lock(&rdev->devlist_mtx);
                 ret = cfg80211_can_add_interface(rdev, wdev->iftype);
+                mutex_unlock(&rdev->devlist_mtx);
                 if (ret)
                         return notifier_from_errno(ret);
                 break;