From 61d422770eb452d8cf5247ddd10117f490ac9d71 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 18 Jul 2012 10:27:27 +0200
Subject: [PATCH] --- yaml --- r: 327625 b: refs/heads/master c:
 7eeff74c29259e9cb7765e3845c0b74057f744da h: refs/heads/master i:   327623:
 7a8ec773e6de4189ea71ef9d3a51ca4f15954647 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 774fd049b2fe..85d43bafc37f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d545daba5357c1ca377a4fe917ccf4de3a3031e0
+refs/heads/master: 7eeff74c29259e9cb7765e3845c0b74057f744da
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 725258c20746..81b2269e8f3a 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -146,6 +146,9 @@ void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata)
 	if (sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)
 		return;
 
+	if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
+		return;
+
 	mod_timer(&sdata->u.mgd.bcn_mon_timer,
 		  round_jiffies_up(jiffies + sdata->u.mgd.beacon_timeout));
 }