Commit 29737737 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mac80211: remove IBSS merge delay

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: default avatarJohannes Berg <>
Signed-off-by: default avatarJohn W. Linville <>
parent 7bb45683
......@@ -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_MAX_STA_ENTRIES 128
......@@ -397,10 +396,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
/* 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) {
printk(KERN_DEBUG "%s: beacon TSF higher than "
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment