3 files changed, 29 insertions, 7 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e95f24eef870..10dd9631e4da 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2982,6 +2982,16 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
         return 0;
 }
 
+static struct ieee80211_channel *
+ieee80211_cfg_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev,
+                          enum nl80211_channel_type *type)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+
+        *type = local->_oper_channel_type;
+        return local->oper_channel;
+}
+
 #ifdef CONFIG_PM
 static void ieee80211_set_wakeup(struct wiphy *wiphy, bool enabled)
 {
@@ -3062,4 +3072,5 @@ struct cfg80211_ops mac80211_config_ops = {
         .get_et_sset_count = ieee80211_get_et_sset_count,
         .get_et_stats = ieee80211_get_et_stats,
         .get_et_strings = ieee80211_get_et_strings,
+        .get_channel = ieee80211_cfg_get_channel,
 };
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 079fc49e3975..6b001e445718 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1759,11 +1759,17 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                         (cfg80211_rdev_list_generation << 2)))
                 goto nla_put_failure;
 
-        if (rdev->monitor_channel) {
-                if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
-                                rdev->monitor_channel->center_freq) ||
-                    nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
-                                rdev->monitor_channel_type))
+        if (rdev->ops->get_channel) {
+                struct ieee80211_channel *chan;
+                enum nl80211_channel_type channel_type;
+
+                chan = rdev->ops->get_channel(&rdev->wiphy, wdev,
+                                              &channel_type);
+                if (chan &&
+                    (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
+                                 chan->center_freq) ||
+                     nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+                                 channel_type)))
                         goto nla_put_failure;
         }
 
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 7df42f541873..494379eb464f 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -827,6 +827,8 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
         struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
+        struct ieee80211_channel *chan;
+        enum nl80211_channel_type channel_type;
 
         switch (wdev->iftype) {
         case NL80211_IFTYPE_STATION:
@@ -834,10 +836,13 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
         case NL80211_IFTYPE_ADHOC:
                 return cfg80211_ibss_wext_giwfreq(dev, info, freq, extra);
         case NL80211_IFTYPE_MONITOR:
-                if (!rdev->monitor_channel)
+                if (!rdev->ops->get_channel)
                         return -EINVAL;
 
-                freq->m = rdev->monitor_channel->center_freq;
+                chan = rdev->ops->get_channel(wdev->wiphy, wdev, &channel_type);
+                if (!chan)
+                        return -EINVAL;
+                freq->m = chan->center_freq;
                 freq->e = 6;
                 return 0;
         default: