3 files changed, 2 insertions, 58 deletions

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index a16cdffb24a..d355f67d0cd 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -82,7 +82,6 @@ int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
                                  int freq, enum nl80211_channel_type chantype)
 {
         struct ieee80211_channel *chan;
-        int err;
 
         if (!rdev->ops->set_monitor_channel)
                 return -EOPNOTSUPP;
@@ -93,13 +92,7 @@ int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
         if (!chan)
                 return -EINVAL;
 
-        err = rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
-        if (!err) {
-                rdev->monitor_channel = chan;
-                rdev->monitor_channel_type = chantype;
-        }
-
-        return err;
+        return rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
 }
 
 void
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 0557bb15902..71b684b5a67 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -736,60 +736,14 @@ static struct device_type wiphy_type = {
         .name   = "wlan",
 };
 
-static struct ieee80211_channel *
-cfg80211_get_any_chan(struct cfg80211_registered_device *rdev)
-{
-        struct ieee80211_supported_band *sband;
-        int i;
-
-        for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
-                sband = rdev->wiphy.bands[i];
-                if (sband && sband->n_channels > 0)
-                        return &sband->channels[0];
-        }
-
-        return NULL;
-}
-
-static void cfg80211_init_mon_chan(struct cfg80211_registered_device *rdev)
-{
-        struct ieee80211_channel *chan;
-
-        chan = cfg80211_get_any_chan(rdev);
-        if (WARN_ON(!chan))
-                return;
-
-        mutex_lock(&rdev->devlist_mtx);
-        WARN_ON(cfg80211_set_monitor_channel(rdev, chan->center_freq,
-                                             NL80211_CHAN_NO_HT));
-        mutex_unlock(&rdev->devlist_mtx);
-}
-
 void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
                                enum nl80211_iftype iftype, int num)
 {
-        bool has_monitors_only_old = cfg80211_has_monitors_only(rdev);
-        bool has_monitors_only_new;
-
         ASSERT_RTNL();
 
         rdev->num_running_ifaces += num;
         if (iftype == NL80211_IFTYPE_MONITOR)
                 rdev->num_running_monitor_ifaces += num;
-
-        has_monitors_only_new = cfg80211_has_monitors_only(rdev);
-        if (has_monitors_only_new != has_monitors_only_old) {
-                if (rdev->ops->set_monitor_enabled)
-                        rdev->ops->set_monitor_enabled(&rdev->wiphy,
-                                                       has_monitors_only_new);
-
-                if (!has_monitors_only_new) {
-                        rdev->monitor_channel = NULL;
-                        rdev->monitor_channel_type = NL80211_CHAN_NO_HT;
-                } else {
-                        cfg80211_init_mon_chan(rdev);
-                }
-        }
 }
 
 static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
@@ -912,6 +866,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);
@@ -1006,7 +961,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                 mutex_unlock(&rdev->devlist_mtx);
                 if (ret)
                         return notifier_from_errno(ret);
-                cfg80211_update_iface_num(rdev, wdev->iftype, 1);
                 break;
         }
 
diff --git a/net/wireless/core.h b/net/wireless/core.h
index bac97da751d..5206c6844fd 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -61,9 +61,6 @@ struct cfg80211_registered_device {
         int num_running_ifaces;
         int num_running_monitor_ifaces;
 
-        struct ieee80211_channel *monitor_channel;
-        enum nl80211_channel_type monitor_channel_type;
-
         /* BSSes/scanning */
         spinlock_t bss_lock;
         struct list_head bss_list;