From 3b3f976718b40601dd4c204dba77cb72c5b2852d Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 4 Mar 2012 10:55:52 +0200 Subject: [PATCH] --- yaml --- r: 291287 b: refs/heads/master c: 97fd311a2615d8f35e796b11a14b6cf3d335d423 h: refs/heads/master i: 291285: 25062d28114dc102f5466ce7212e8f43ef62cb13 291283: efde036134dc4b8eb341376eabf8982a7d98eff6 291279: 4ccacb41d4dbd330b8704bcd843906ba0dbdc84e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2c98938f2610..de6fc5e977dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 121af04995d29e3287b849a768789c668d39dce3 +refs/heads/master: 97fd311a2615d8f35e796b11a14b6cf3d335d423 diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index 85bbe7f4f517..1d5f2d5614fb 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -3057,8 +3057,6 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw, struct cfg80211_scan_request *req) { struct wl1271 *wl = hw->priv; - struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif); - int ret; u8 *ssid = NULL; size_t len = 0; @@ -3086,8 +3084,8 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw, if (ret < 0) goto out; - if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags) && - test_bit(wlvif->role_id, wl->roc_map)) { + /* fail if there is any role in ROC */ + if (find_first_bit(wl->roc_map, WL12XX_MAX_ROLES) < WL12XX_MAX_ROLES) { /* don't allow scanning right now */ ret = -EBUSY; goto out_sleep;