diff options
| author | Eliad Peller <eliad@wizery.com> | 2012-01-24 16:18:42 (GMT) |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-02-15 06:38:30 (GMT) |
| commit | 7db4ee6d0a932bb95f839d9b427899b74139a8d5 (patch) | |
| tree | 1097b2991aca86b6395644c67c568f460511444d /drivers | |
| parent | 2c882fa47502ef201e0533fc7cc21b097f4bcdca (diff) | |
| download | linux-fsl-qoriq-7db4ee6d0a932bb95f839d9b427899b74139a8d5.tar.xz | |
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 <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) |