lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libertas: make association paths consistent

Browse Source 
The BSS to associate with (in either Infrastructure or IBSS join
operations) is now stored in _one_ place in the association request (the
bss member), not two places as before (pattemptedbss and
curbssparams->bssdescriptor).

Association requests are passed to the necessary association functions
to (a) give them access to the bss member and (b) ensure that
association/join/start setup uses settings from the request, not the
current adapter settings (which may not be valid for the requested
settings).

Because the 'bss' member of the association request is used now, the
command return functions from associate and adhoc join/start need access
to the in-progress association request to update curbssparams when
everything is done.  The association worker moves the request from
pending to in-progress for the duration of the association attempt.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams
2007-05-25 17:09:41 -04:00
committed by John W. Linville
parent ef9a264b7a
commit e76850d620
10 changed files with 215 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/wireless/libertas/scan.c
View File

@@ -235,24 +235,10 @@ static void wlan_scan_process_results(wlan_private * priv)
wlan_adapter *adapter = priv->adapter;
struct bss_descriptor * iter_bss;
if (adapter->connect_status == libertas_connected)
return;
mutex_lock(&adapter->lock);
if (adapter->connect_status != libertas_connected)
goto debug_print;
/* try to find the current BSSID in the scan list */
list_for_each_entry (iter_bss, &adapter->network_list, list) {
if (libertas_SSID_cmp(&iter_bss->ssid, &adapter->curbssparams.ssid))
continue;
if (memcmp(adapter->curbssparams.bssid, iter_bss->bssid, ETH_ALEN))
continue;
/* Make a copy of current BSSID descriptor */
memcpy(&adapter->curbssparams.bssdescriptor, iter_bss,
sizeof(struct bss_descriptor));
break;
}
debug_print:
list_for_each_entry (iter_bss, &adapter->network_list, list) {
lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n",
i++,
@@ -260,7 +246,6 @@ debug_print:
iter_bss->bssid[3], iter_bss->bssid[4], iter_bss->bssid[5],
(s32) iter_bss->rssi, iter_bss->ssid.ssid);
}
mutex_unlock(&adapter->lock);
}