Skip to contentSkip to conversation

mac80211: Give it some time to do the TSF sync

PATCH Superseded Alina Friedrichsen 3 participants 3 messages Feb 21, 2009 – Feb 22, 2009 mac80211

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mac80211: Give it some time to do the TSF sync

Give slow hardware some time to do the TSF sync, to not run into an IBS= S merging endless loop in some rarely situations.

---

net/mac80211/ibss.c +0 -0
index 1bbfc70..896e45c 100644
@@ -332,7 +332,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_=

sub_if_data *sdata,
jiffies);
#endif
=20
- if (beacon_timestamp > rx_timestamp) {
+ if (beacon_timestamp > rx_timestamp && rx_timestamp > 0x400000) {
#ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: beacon TSF higher than "
"local TSF - IBSS merge with BSSID %pM\n",

--=20
Jetzt 1 Monat kostenlos! GMX FreeDSL - Telefonanschluss + DSL=20 f=FCr nur 17,95 Euro/mtl.!* http://dsl.gmx.de/?ac=3DOM.AD.PD003K11308T4=
569a
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles= s" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#1 lore raw
Quoted 1 line · On Saturday 21 February 2009 22:52:02 Alina Friedrichsen wrote:

Give slow hardware some time to do the TSF sync, to not run into an IBSS merging endless loop in some rarely situations.

It would be great to put this into a source code comment.
Without this knowledge one immediately gets a WTF-lookalike face when seeing this code.

Quoted 16 lines

---

net/mac80211/ibss.c +1 -1
index 1bbfc70..896e45c 100644
@@ -332,7 +332,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 	       jiffies);
 #endif
 
-	if (beacon_timestamp > rx_timestamp) {
+	if (beacon_timestamp > rx_timestamp && rx_timestamp > 0x400000) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
 		printk(KERN_DEBUG "%s: beacon TSF higher than "
 		       "local TSF - IBSS merge with BSSID %pM\n",
Signature · 1 line
Greetings, Michael.
#2 lore raw
Quoted 6 lines · Michael Buesch
Quoted 1 line · On Saturday 21 February 2009 22:52:02 Alina Friedrichsen wrote:

Give slow hardware some time to do the TSF sync, to not run into an IBSS merging endless loop in some rarely situations.

It would be great to put this into a source code comment. Without this knowledge one immediately gets a WTF-lookalike face when seeing this code.

I fully agree.

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-	if (beacon_timestamp > rx_timestamp) {
+	if (beacon_timestamp > rx_timestamp && rx_timestamp > 0x400000) {

And no magic numbers, please. Create a define for that.

Signature · 1 line
Kalle Valo