From d8d03259bec4ab212bacc77b96f195a54b334d74 Mon Sep 17 00:00:00 2001
From: Sujith <Sujith.Manoharan@atheros.com>
Date: Fri, 8 Jan 2010 10:36:13 +0530
Subject: [PATCH] --- yaml --- r: 183599 b: refs/heads/master c:
 199afd9d89b18e8b530734ed73788518e19bed9b h: refs/heads/master i:   183597:
 0fba79875969ddddf4f4d3a84d5f89aba90c9b02   183595:
 b83fdac0572f4d4af050af1a11e263f35d0dadc4   183591:
 0deafdb5a95aab3aca791f4fc6b36aadf8f872d1   183583:
 33c973bd28393d9ce1a6537a85a6e143840e5d18 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5845c4fcc0f3..73ae4b889916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1395d3f00a4164caae168b041855d48e0fa9ea4c
+refs/heads/master: 199afd9d89b18e8b530734ed73788518e19bed9b
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index 1f7222aef89f..b39c7bc41143 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -1581,6 +1581,14 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
 		}
 	}
 
+	if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
+		if (conf->flags & IEEE80211_CONF_MONITOR) {
+			ath_print(common, ATH_DBG_CONFIG,
+				  "HW opmode set to Monitor mode\n");
+			sc->sc_ah->opmode = NL80211_IFTYPE_MONITOR;
+		}
+	}
+
 	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
 		struct ieee80211_channel *curchan = hw->conf.channel;
 		int pos = curchan->hw_value;