From 62b58817217f9134f18f252c533007c886129597 Mon Sep 17 00:00:00 2001
From: Alina Friedrichsen <x-alina@gmx.net>
Date: Sun, 22 Feb 2009 18:19:33 +0100
Subject: [PATCH] --- yaml --- r: 134951 b: refs/heads/master c:
 4a332a385a86e31bfe181d969a8cb5579798fe03 h: refs/heads/master i:   134949:
 90130f10e26567f9042fbd1fdf7b5d81fe68334b   134947:
 41bcfd51dc438557ee627ad0e3ff055125f52a9d   134943:
 3a14e98b621c862948a106770160e25a62ed869d v: v3

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

diff --git a/[refs] b/[refs]
index dd658c553627..565343bb4de6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e8f08231388f9e16c6f1e2461f53afaf7f1e5e
+refs/heads/master: 4a332a385a86e31bfe181d969a8cb5579798fe03
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 7a944ca1c840..a96ce9dfc6b5 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -29,6 +29,7 @@
 #define IEEE80211_IBSS_JOIN_TIMEOUT (7 * HZ)
 
 #define IEEE80211_IBSS_MERGE_INTERVAL (30 * HZ)
+#define IEEE80211_IBSS_MERGE_DELAY 0x400000
 #define IEEE80211_IBSS_INACTIVITY_LIMIT (60 * HZ)
 
 #define IEEE80211_IBSS_MAX_STA_ENTRIES 128
@@ -336,6 +337,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 	       jiffies);
 #endif
 
+	/* give slow hardware some time to do the TSF sync */
+	if (rx_timestamp < IEEE80211_IBSS_MERGE_DELAY)
+		goto put_bss;
+
 	if (beacon_timestamp > rx_timestamp) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
 		printk(KERN_DEBUG "%s: beacon TSF higher than "