From e4721c88f23d6826f34d1a074ef8bf8c3558bc12 Mon Sep 17 00:00:00 2001
From: Michal Kazior <michal.kazior@tieto.com>
Date: Fri, 29 Jun 2012 12:47:04 +0200
Subject: [PATCH] --- yaml --- r: 315196 b: refs/heads/master c:
 b78e8ceac23655e1e06b30aa95ab11742d1ac7c0 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/chan.c | 9 ++++++++-
 trunk/net/wireless/core.c | 8 +++++++-
 trunk/net/wireless/core.h | 3 +++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1ecc1ab80e9a..6580c6f6d3c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f03c1ed8901a01ad4abcef95c02c007a2d481c2
+refs/heads/master: b78e8ceac23655e1e06b30aa95ab11742d1ac7c0
diff --git a/trunk/net/wireless/chan.c b/trunk/net/wireless/chan.c
index 019401b0b5e3..434c56b92c3c 100644
--- a/trunk/net/wireless/chan.c
+++ b/trunk/net/wireless/chan.c
@@ -82,6 +82,7 @@ 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;
@@ -92,7 +93,13 @@ int cfg80211_set_monitor_channel(struct cfg80211_registered_device *rdev,
 	if (!chan)
 		return -EINVAL;
 
-	return rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
+	err = rdev->ops->set_monitor_channel(&rdev->wiphy, chan, chantype);
+	if (!err) {
+		rdev->monitor_channel = chan;
+		rdev->monitor_channel_type = chantype;
+	}
+
+	return err;
 }
 
 void
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
index 8412da7d0f25..1b5daa73b3a9 100644
--- a/trunk/net/wireless/core.c
+++ b/trunk/net/wireless/core.c
@@ -730,9 +730,15 @@ void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
 		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 (has_monitors_only_new != has_monitors_only_old) {
 		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;
+		}
+	}
 }
 
 static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
diff --git a/trunk/net/wireless/core.h b/trunk/net/wireless/core.h
index 99acd51343b1..d5efe1b0a8f7 100644
--- a/trunk/net/wireless/core.h
+++ b/trunk/net/wireless/core.h
@@ -59,6 +59,9 @@ 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;