2010-11-22 10:59:34

by Juuso Oikarinen

[permalink] [raw]
Subject: [PATCHv3] wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc

From: Juuso Oikarinen <[email protected]>

On the disassociation event from the mac80211, the wl12xx driver does not
clear the chipset configuration related to the AP - i.e. it does not perform
a DISCONNECT and then a JOIN with zero SSID and dummy BSSID. Also, it does not
unset the BSSID filter.

Often this is not a problem, as the above is performed upon entering idle
state. But if a scenario arises where a new association is attempted without
cycling through idle state, the new association will fail.

Fix this by resetting the firmware state on disassociation.

Signed-off-by: Juuso Oikarinen <[email protected]>
---
v2: Changed the function calls to ones with a bit narrower scope
v3: Moved the function calls slightly forward, no functional change
v4: This time the v3 changes also committed. Sorry for this :(

drivers/net/wireless/wl12xx/main.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 31f0e2f..708ffe3 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2011,9 +2011,12 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,

/* Disable the keep-alive feature */
ret = wl1271_acx_keep_alive_mode(wl, false);
-
if (ret < 0)
goto out_sleep;
+
+ /* restore the bssid filter and go to dummy bssid */
+ wl1271_unjoin(wl);
+ wl1271_dummy_join(wl);
}

}
--
1.7.1



2010-11-22 13:23:00

by Luciano Coelho

[permalink] [raw]
Subject: Re: [PATCHv3] wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc

On Mon, 2010-11-22 at 12:59 +0200, ext [email protected] wrote:
> From: Juuso Oikarinen <[email protected]>
>
> On the disassociation event from the mac80211, the wl12xx driver does not
> clear the chipset configuration related to the AP - i.e. it does not perform
> a DISCONNECT and then a JOIN with zero SSID and dummy BSSID. Also, it does not
> unset the BSSID filter.
>
> Often this is not a problem, as the above is performed upon entering idle
> state. But if a scenario arises where a new association is attempted without
> cycling through idle state, the new association will fail.
>
> Fix this by resetting the firmware state on disassociation.
>
> Signed-off-by: Juuso Oikarinen <[email protected]>
> ---

Reviewed-by: Luciano Coelho <[email protected]>

This looks good now. Applied.

--
Cheers,
Luca.