Hi Alina,
Version 4 of your patch is working for me against wl
(master-2009-01-22) and with iwl3945.
Samuel's patch is obsolete.
Could you please send a separate email containing your new patch v4?
>>> [PATCH v4] mac80211: Fixed BSSID handling revisited. <<<
My 2nd request is just cosmetics:
Can you please patch next time against wireless directory (patch is attached).
This is just a proposal.
Thanks for your help.
Kind Regards,
Sedat
On Fri, Jan 23, 2009 at 8:13 AM, Alina Friedrichsen <x-alina@xxxxxxx> wrote:
> Hello!
>
>> > I reverted this in wireless-testing (and it never went anywhere
>> > upstream). Of course, now it looks like Samuel has a fix...maybe
>> > I'll combine them...
>>
>> Samuel's fix works for me.
>
> If this works for the others too, I would propose the following patch. Without it, e.g. the beacon messages in IBSS mode are broken, if you set a fixed BSSID.
>
> (The iwl4965 low level driver sends back an error code, if you want to set a fixed BSSID, so I think, we should simply ignore it, as it will be tried the next time when the initiated new network join is complete.)
>
> Regards
> Alina
>
> --
> Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger
>
Index: wireless-testing/net/mac80211/mlme.c
===================================================================
--- wireless-testing.orig/net/mac80211/mlme.c
+++ wireless-testing/net/mac80211/mlme.c
@@ -1614,6 +1614,7 @@
ieee80211_sta_def_wmm_params(sdata, bss);
+ ifsta->flags |= IEEE80211_STA_PREV_BSSID_SET;
ifsta->state = IEEE80211_STA_MLME_IBSS_JOINED;
mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL);
@@ -2177,19 +2178,18 @@
int i;
int ret;
-#if 0
- /* Easier testing, use fixed BSSID. */
- memset(bssid, 0xfe, ETH_ALEN);
-#else
- /* Generate random, not broadcast, locally administered BSSID. Mix in
- * own MAC address to make sure that devices that do not have proper
- * random number generator get different BSSID. */
- get_random_bytes(bssid, ETH_ALEN);
- for (i = 0; i < ETH_ALEN; i++)
- bssid[i] ^= sdata->dev->dev_addr[i];
- bssid[0] &= ~0x01;
- bssid[0] |= 0x02;
-#endif
+ if (sdata->u.sta.flags & IEEE80211_STA_BSSID_SET) {
+ memcpy(bssid, ifsta->bssid, ETH_ALEN);
+ } else {
+ /* Generate random, not broadcast, locally administered BSSID. Mix in
+ * own MAC address to make sure that devices that do not have proper
+ * random number generator get different BSSID. */
+ get_random_bytes(bssid, ETH_ALEN);
+ for (i = 0; i < ETH_ALEN; i++)
+ bssid[i] ^= sdata->dev->dev_addr[i];
+ bssid[0] &= ~0x01;
+ bssid[0] |= 0x02;
+ }
printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n",
sdata->dev->name, bssid);
@@ -2250,6 +2250,9 @@
memcmp(ifsta->ssid, bss->ssid, bss->ssid_len) != 0
|| !(bss->capability & WLAN_CAPABILITY_IBSS))
continue;
+ if ((ifsta->flags & IEEE80211_STA_BSSID_SET) &&
+ memcmp(ifsta->bssid, bss->bssid, ETH_ALEN) != 0)
+ continue;
#ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG " bssid=%pM found\n", bss->bssid);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */
@@ -2266,7 +2269,9 @@
"%pM\n", bssid, ifsta->bssid);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */
- if (found && memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0) {
+ if (found &&
+ ((!(ifsta->flags & IEEE80211_STA_PREV_BSSID_SET)) ||
+ memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0)) {
int ret;
int search_freq;
@@ -2604,16 +2609,16 @@
memset(ifsta->ssid, 0, sizeof(ifsta->ssid));
memcpy(ifsta->ssid, ssid, len);
ifsta->ssid_len = len;
- ifsta->flags &= ~IEEE80211_STA_PREV_BSSID_SET;
}
+ ifsta->flags &= ~IEEE80211_STA_PREV_BSSID_SET;
+
if (len)
ifsta->flags |= IEEE80211_STA_SSID_SET;
else
ifsta->flags &= ~IEEE80211_STA_SSID_SET;
- if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
- !(ifsta->flags & IEEE80211_STA_BSSID_SET)) {
+ if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
ifsta->ibss_join_req = jiffies;
ifsta->state = IEEE80211_STA_MLME_IBSS_SEARCH;
return ieee80211_sta_find_ibss(sdata, ifsta);
@@ -2633,36 +2638,21 @@
int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid)
{
struct ieee80211_if_sta *ifsta;
- int res;
- bool valid;
ifsta = &sdata->u.sta;
- valid = is_valid_ether_addr(bssid);
- if (memcmp(ifsta->bssid, bssid, ETH_ALEN) != 0) {
- if(valid)
- memcpy(ifsta->bssid, bssid, ETH_ALEN);
- else
- memset(ifsta->bssid, 0, ETH_ALEN);
- res = 0;
- /*
- * Hack! See also ieee80211_sta_set_ssid.
- */
- if (netif_running(sdata->dev))
- res = ieee80211_if_config(sdata, IEEE80211_IFCC_BSSID);
- if (res) {
- printk(KERN_DEBUG "%s: Failed to config new BSSID to "
- "the low-level driver\n", sdata->dev->name);
- return res;
- }
- }
-
- if (valid)
+ if (is_valid_ether_addr(bssid)) {
+ memcpy(ifsta->bssid, bssid, ETH_ALEN);
ifsta->flags |= IEEE80211_STA_BSSID_SET;
- else
+ } else {
+ memset(ifsta->bssid, 0, ETH_ALEN);
ifsta->flags &= ~IEEE80211_STA_BSSID_SET;
+ }
- return 0;
+ if (netif_running(sdata->dev))
+ ieee80211_if_config(sdata, IEEE80211_IFCC_BSSID);
+
+ return ieee80211_sta_set_ssid(sdata, ifsta->ssid, ifsta->ssid_len);
}
int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, char *ie, size_t len)
