mac80211: remove IBSS merge delay (29737737) · Commits · 戴 / test

This reverts ("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 we no longer attempt to merge with the IBSS we're already in. Signed-off-by:

Johannes Berg <johannes.berg@intel.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

net/mac80211/ibss.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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 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 "

Admin message