[PATCH] wl12xx: set do_join on BSS_CHANGED_ASSOC

[PATCH] wl12xx: set do_join on BSS_CHANGED_ASSOC

[Eliad Peller]

wl12xx sets the do_join flag (which later starts the
sta role) when the bssid was changed and the sta is
associated. However, this no longer happens after
the "mac80211: remove spurious BSSID change flag"
patch.

Fix it by setting the do_join flag on BSS_CHANGED_ASSOC
(for IBSS, do_join is already set on BSS_CHANGED_IBSS)

Signed-off-by: Eliad Peller <eliad@wizery.com>
---
 drivers/net/wireless/wl12xx/main.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 7e0a096..ea654b8 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -3950,8 +3950,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 		wlvif->rssi_thold = bss_conf->cqm_rssi_thold;
 	}
 
-	if (changed & BSS_CHANGED_BSSID &&
-	    (is_ibss || bss_conf->assoc))
+	if (changed & BSS_CHANGED_BSSID)
 		if (!is_zero_ether_addr(bss_conf->bssid)) {
 			ret = wl12xx_cmd_build_null_data(wl, wlvif);
 			if (ret < 0)
@@ -3960,9 +3959,6 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 			ret = wl1271_build_qos_null_data(wl, vif);
 			if (ret < 0)
 				goto out;
-
-			/* Need to update the BSSID (for filtering etc) */
-			do_join = true;
 		}
 
 	if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) {
@@ -3989,6 +3985,7 @@ sta_not_found:
 			int ieoffset;
 			wlvif->aid = bss_conf->aid;
 			wlvif->beacon_int = bss_conf->beacon_int;
+			do_join = true;
 			set_assoc = true;
 
 			/*
-- 
1.7.6.401.g6a319

Re: [PATCH] wl12xx: set do_join on BSS_CHANGED_ASSOC

[Luciano Coelho]

On Mon, 2012-03-12 at 14:53 +0200, Eliad Peller wrote: 
> wl12xx sets the do_join flag (which later starts the
> sta role) when the bssid was changed and the sta is
> associated. However, this no longer happens after
> the "mac80211: remove spurious BSSID change flag"
> patch.
> 
> Fix it by setting the do_join flag on BSS_CHANGED_ASSOC
> (for IBSS, do_join is already set on BSS_CHANGED_IBSS)
> 
> Signed-off-by: Eliad Peller <eliad@wizery.com>
> ---

Applied and pushed to wl12xx/master.  Thanks!

-- 
Cheers,
Luca.