diff options
| author |   Eliad Peller <eliad@wizery.com> | 2011-10-10 10:13:01 +0200 |
|---|---|---|
| committer |   Luciano Coelho <coelho@ti.com> | 2011-10-11 15:09:57 +0300 |
| commit | eee514e3d6cecc7abdf1b27734169004fefb0941 (patch) | |
| tree | c2d1ed7982e4c34302a39949a968a2b8d5eda378 /drivers/net/wireless/wl12xx/scan.c | |
| parent | wl12xx: make WL1271_FLAG_STA_ASSOCIATED flag per-vif (diff) | |
| download | linux-dev-eee514e3d6cecc7abdf1b27734169004fefb0941.tar.xz linux-dev-eee514e3d6cecc7abdf1b27734169004fefb0941.zip | |
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.c | 2 |
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) is_sta = (wlvif->bss_type == BSS_TYPE_STA_BSS); is_ibss = (wlvif->bss_type == BSS_TYPE_IBSS); if (((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) || - (is_ibss && !test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags))) && + (is_ibss && !test_bit(WLVIF_FLAG_IBSS_JOINED, &wlvif->flags))) && !test_bit(wlvif->dev_role_id, wl->roc_map)) { /* restore remain on channel */ wl12xx_cmd_role_start_dev(wl, wlvif); |