* [PATCH] mac80211: remove IBSS merge delay
@ 2011-02-24 13:46 Johannes Berg
0 siblings, 0 replies; only message in thread
From: Johannes Berg @ 2011-02-24 13:46 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
From: Johannes Berg <johannes.berg@intel.com>
This reverts 4a332a38
("mac80211: Give it some time to do the TSF sync").
There's no point in waiting with a new IBSS merge
just because the hardware hasn't merged up with
the old IBSS yet, and since 34e8f082 we no longer
attempt to merge with the IBSS we're already in.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/ibss.c | 5 -----
1 file changed, 5 deletions(-)
--- wireless-testing.orig/net/mac80211/ibss.c 2011-02-24 12:49:33.000000000 +0100
+++ wireless-testing/net/mac80211/ibss.c 2011-02-24 12:49:46.000000000 +0100
@@ -31,7 +31,6 @@
#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
@@ -397,10 +396,6 @@ static void ieee80211_rx_bss_info(struct
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 "
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-24 13:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-24 13:46 [PATCH] mac80211: remove IBSS merge delay Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).