From c56e60f92533f34390ee9c6a21709bae08b419fa Mon Sep 17 00:00:00 2001
From: Sujith <Sujith.Manoharan@atheros.com>
Date: Mon, 2 Nov 2009 12:33:23 +0530
Subject: [PATCH] --- yaml --- r: 171411 b: refs/heads/master c:
 450aae3d7b60a970f266349a837dfb30a539198b h: refs/heads/master i:   171409:
 3ab76cd178588560319c93fe5dcd09c68e432d4c   171407:
 15230e0656228593cabf87bffd709845d5baf518 v: v3

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

diff --git a/[refs] b/[refs]
index 7b6469b91779..9bd34c9bf4f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b35686d0b2d754d627aeb0c4340884aeaed8e4f3
+refs/heads/master: 450aae3d7b60a970f266349a837dfb30a539198b
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index ca8ecce31d34..6ae288387a11 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -453,6 +453,10 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
 
 	ieee80211_sta_expire(sdata, IEEE80211_IBSS_INACTIVITY_LIMIT);
 
+	if (time_before(jiffies, ifibss->last_scan_completed +
+		       IEEE80211_IBSS_MERGE_INTERVAL))
+		return;
+
 	if (ieee80211_sta_active_ibss(sdata))
 		return;