From: Eliad Peller Date: Tue, 24 Jan 2012 16:18:42 +0000 (+0200) Subject: wl12xx: check bss_conf->assoc on CHANGED_BSSID X-Git-Tag: v3.12-rc1~3664^2~108^2~351^2~34 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7db4ee6d0a932bb95f839d9b427899b74139a8d5;p=kernel%2Fkernel-generic.git wl12xx: check bss_conf->assoc on CHANGED_BSSID with the new auth/assoc redesign, we get CHANGED_BSSID indication before CHANGED_ASSOC indication, while our CHANGED_BSSID handling block assumes we are already associated. Fix it by checking we are either in ibss mode, or already associated. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index ce0a233..bba2a52 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -3665,7 +3665,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, wlvif->rssi_thold = bss_conf->cqm_rssi_thold; } - if (changed & BSS_CHANGED_BSSID) + if (changed & BSS_CHANGED_BSSID && + (is_ibss || bss_conf->assoc)) if (!is_zero_ether_addr(bss_conf->bssid)) { ret = wl12xx_cmd_build_null_data(wl, wlvif); if (ret < 0)