linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fixed BSSID step 3: Don't merge with the same BSSID
@ 2009-01-06  2:01 Alina Friedrichsen
  2009-01-08  9:10 ` Jouni Malinen
  0 siblings, 1 reply; 12+ messages in thread
From: Alina Friedrichsen @ 2009-01-06  2:01 UTC (permalink / raw)
  To: linux-wireless; +Cc: johannes

[-- Attachment #1: Type: text/plain, Size: 1263 bytes --]

It's completely unnecessary to merge with same BSSID. Because here in our city networks we have many of the same BSSID (and SSID) with deferent timestamps, this causes problems.

See the bug report here:
http://wiki.villagetelco.org/index.php/Information_about_cell-id_splitting%2C_stuck_beacons%2C_and_failed_IBSS_merges!#The_phenomenon_of_IBSS-ID_cell_splits

Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>

diff -urN compat-wireless-2009-01-05.orig/net/mac80211/mlme.c compat-wireless-2009-01-05.work/net/mac80211/mlme.c
--- compat-wireless-2009-01-05.orig/net/mac80211/mlme.c	2009-01-06 02:01:46.000000000 +0100
+++ compat-wireless-2009-01-05/net/mac80211/mlme.c	2009-01-06 02:05:22.000000000 +0100
@@ -1705,7 +1705,8 @@
 		       (unsigned long long)(rx_timestamp - beacon_timestamp),
 		       jiffies);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
-		if (beacon_timestamp > rx_timestamp) {
+		if (beacon_timestamp > rx_timestamp &&
+		    memcmp(sdata->u.sta.bssid, mgmt->bssid, ETH_ALEN) != 0) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
 			printk(KERN_DEBUG "%s: beacon TSF higher than "
 			       "local TSF - IBSS merge with BSSID %s\n",

-- 
Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger

[-- Attachment #2: step3-dont-merge-with-the-same-bssid.patch --]
[-- Type: text/x-patch, Size: 730 bytes --]

diff -urN compat-wireless-2009-01-05.orig/net/mac80211/mlme.c compat-wireless-2009-01-05.work/net/mac80211/mlme.c
--- compat-wireless-2009-01-05.orig/net/mac80211/mlme.c	2009-01-06 02:01:46.000000000 +0100
+++ compat-wireless-2009-01-05/net/mac80211/mlme.c	2009-01-06 02:05:22.000000000 +0100
@@ -1705,7 +1705,8 @@
 		       (unsigned long long)(rx_timestamp - beacon_timestamp),
 		       jiffies);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
-		if (beacon_timestamp > rx_timestamp) {
+		if (beacon_timestamp > rx_timestamp &&
+		    memcmp(sdata->u.sta.bssid, mgmt->bssid, ETH_ALEN) != 0) {
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
 			printk(KERN_DEBUG "%s: beacon TSF higher than "
 			       "local TSF - IBSS merge with BSSID %s\n",

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2009-01-21  8:45 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-06  2:01 [PATCH] Fixed BSSID step 3: Don't merge with the same BSSID Alina Friedrichsen
2009-01-08  9:10 ` Jouni Malinen
2009-01-09 20:53   ` Alina Friedrichsen
2009-01-10  9:16     ` Jouni Malinen
2009-01-12  4:15       ` Alina Friedrichsen
2009-01-12 17:35         ` Jouni Malinen
2009-01-17  3:39       ` [PATCH] Fixed BSSID (timesync) Alina Friedrichsen
2009-01-17  3:51       ` Alina Friedrichsen
2009-01-17 22:12   ` [PATCH] Fixed BSSID step 3: Don't merge with the same BSSID Alina Friedrichsen
2009-01-20 15:10     ` Jouni Malinen
2009-01-20 18:56       ` Alina Friedrichsen
2009-01-21  8:45         ` Jouni Malinen

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).