From a07e63312db6d89a49108b72e3e1bbde16b57e5e Mon Sep 17 00:00:00 2001
From: Pontus Fuchs <pontus.fuchs@gmail.com>
Date: Tue, 3 Apr 2012 16:39:58 +0200
Subject: [PATCH] --- yaml --- r: 300947 b: refs/heads/master c:
 d91df0e3a1b9a7427785cb8d28be073df9b18b78 h: refs/heads/master i:   300945:
 6a06780d047f38c2f67ca88901b806586e250df0   300943:
 1ad7bba69d4ca6201ffd17e66f7d9abc9055d846 v: v3

---
 [refs]                           |  2 +-
 trunk/include/net/cfg80211.h     |  3 ++-
 trunk/net/mac80211/cfg.c         |  4 +++-
 trunk/net/wireless/nl80211.c     | 13 +++++++++++++
 trunk/net/wireless/wext-compat.c |  3 ++-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index effb6d5e010f..70a736b345e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a4b43fde103da510d8962a073bb748706f426bd
+refs/heads/master: d91df0e3a1b9a7427785cb8d28be073df9b18b78
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index a587867375b2..d17ad5f2b603 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -1710,7 +1710,8 @@ struct cfg80211_ops {
 				  struct net_device *dev,
 				  u16 noack_map);
 
-	struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy);
+	struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,
+					       enum nl80211_channel_type *type);
 };
 
 /*
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 355735491252..510a745c3108 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -2688,10 +2688,12 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
 }
 
 static struct ieee80211_channel *
-ieee80211_wiphy_get_channel(struct wiphy *wiphy)
+ieee80211_wiphy_get_channel(struct wiphy *wiphy,
+			    enum nl80211_channel_type *type)
 {
 	struct ieee80211_local *local = wiphy_priv(wiphy);
 
+	*type = local->_oper_channel_type;
 	return local->oper_channel;
 }
 
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 5e261234d271..bcf6f70e518d 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -1501,6 +1501,19 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags,
 		    rdev->devlist_generation ^
 			(cfg80211_rdev_list_generation << 2));
 
+	if (rdev->ops->get_channel) {
+		struct ieee80211_channel *chan;
+		enum nl80211_channel_type channel_type;
+
+		chan = rdev->ops->get_channel(&rdev->wiphy, &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);
+		}
+	}
+
 	return genlmsg_end(msg, hdr);
 
  nla_put_failure:
diff --git a/trunk/net/wireless/wext-compat.c b/trunk/net/wireless/wext-compat.c
index 3c24eb97e9d7..6a6181a673ca 100644
--- a/trunk/net/wireless/wext-compat.c
+++ b/trunk/net/wireless/wext-compat.c
@@ -821,6 +821,7 @@ 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:
@@ -831,7 +832,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
 		if (!rdev->ops->get_channel)
 			return -EINVAL;
 
-		chan = rdev->ops->get_channel(wdev->wiphy);
+		chan = rdev->ops->get_channel(wdev->wiphy, &channel_type);
 		if (!chan)
 			return -EINVAL;
 		freq->m = chan->center_freq;