openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wl12xx: set do_join on BSS_CHANGED_ASSOC 

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>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Eliad Peller 2012-03-12 14:53:04 +02:00 committed by Luciano Coelho
parent 47107e8444
commit 446f5ca19a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/wl12xx/main.c
View File

@ -3791,8 +3791,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
wlvif->rssi_thold = bss_conf->cqm_rssi_thold; 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)) { if (!is_zero_ether_addr(bss_conf->bssid)) {
ret = wl12xx_cmd_build_null_data(wl, wlvif); ret = wl12xx_cmd_build_null_data(wl, wlvif);
if (ret < 0) if (ret < 0)
@ -3801,9 +3800,6 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
ret = wl1271_build_qos_null_data(wl, vif); ret = wl1271_build_qos_null_data(wl, vif);
if (ret < 0) if (ret < 0)
goto out; goto out;
/* Need to update the BSSID (for filtering etc) */
do_join = true;
} }
if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) { if (changed & (BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) {
@ -3830,6 +3826,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
int ieoffset; int ieoffset;
wlvif->aid = bss_conf->aid; wlvif->aid = bss_conf->aid;
wlvif->beacon_int = bss_conf->beacon_int; wlvif->beacon_int = bss_conf->beacon_int;
do_join = true;
set_assoc = true; set_assoc = true;
/* /*