---

yaml --- r: 171411 b: refs/heads/master c: 450aae3 h: refs/heads/master i: 171409: 3ab76cd 171407: 15230e0 v: v3
git-mirror · Nov 4, 2009 · c56e60f · c56e60f
1 parent d7aed56
commit c56e60f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;