aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/scan.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-10 04:13:01 -0400
committerLuciano Coelho <coelho@ti.com>2011-10-11 08:09:57 -0400
commiteee514e3d6cecc7abdf1b27734169004fefb0941 (patch)
treec2d1ed7982e4c34302a39949a968a2b8d5eda378 /drivers/net/wireless/wl12xx/scan.c
parentba8447f64159927baf673d827e404605471d8f68 (diff)
wl12xx: make WL1271_FLAG_IBSS_JOINED flag per-vif
This flag should be set per-vif, rather than globally. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/scan.c')
-rw-r--r--drivers/net/wireless/wl12xx/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c
index 687f59b871ef..765f08ba29af 100644
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -73,7 +73,7 @@ void wl1271_scan_complete_work(struct work_struct *work)
73 is_sta = (wlvif->bss_type == BSS_TYPE_STA_BSS); 73 is_sta = (wlvif->bss_type == BSS_TYPE_STA_BSS);
74 is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS); 74 is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS);
75 if (((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) || 75 if (((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) ||
76 (is_ibss && !test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags))) && 76 (is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) &&
77 !test_bit(wlvif->dev_role_id, wl->roc_map)) { 77 !test_bit(wlvif->dev_role_id, wl->roc_map)) {
78 /* restore remain on channel */ 78 /* restore remain on channel */
79 wl12xx_cmd_role_start_dev(wl, wlvif); 79 wl12xx_cmd_role_start_dev(wl, wlvif);