[PATCH] libertas: make association paths consistent
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:

gecommit door
John W. Linville

bovenliggende
ef9a264b7a
commit
e76850d620
@@ -654,7 +654,8 @@ int libertas_ret_802_11d_domain_info(wlan_private * priv,
|
||||
* @param priv pointer to wlan_private
|
||||
* @return 0; -1
|
||||
*/
|
||||
int libertas_parse_dnld_countryinfo_11d(wlan_private * priv)
|
||||
int libertas_parse_dnld_countryinfo_11d(wlan_private * priv,
|
||||
struct bss_descriptor * bss)
|
||||
{
|
||||
int ret;
|
||||
wlan_adapter *adapter = priv->adapter;
|
||||
@@ -663,8 +664,7 @@ int libertas_parse_dnld_countryinfo_11d(wlan_private * priv)
|
||||
if (priv->adapter->enable11d) {
|
||||
memset(&adapter->parsed_region_chan, 0,
|
||||
sizeof(struct parsed_region_chan_11d));
|
||||
ret = parse_domain_info_11d(&adapter->pattemptedbssdesc->
|
||||
countryinfo, 0,
|
||||
ret = parse_domain_info_11d(&bss->countryinfo, 0,
|
||||
&adapter->parsed_region_chan);
|
||||
|
||||
if (ret == -1) {
|
||||
|
Verwijs in nieuw issue
Block a user