diff options
| author |   Eliad Peller <eliad@wizery.com> | 2012-03-04 10:55:52 +0200 |
|---|---|---|
| committer |   Luciano Coelho <coelho@ti.com> | 2012-03-05 15:45:25 +0200 |
| commit | 97fd311a2615d8f35e796b11a14b6cf3d335d423 (patch) | |
| tree | a0bee642ba33b98d0488920cbc411f6e9e4e68a7 /drivers/net/wireless/wl12xx/main.c | |
| parent | wl12xx: don't handle change_channel while associated (diff) | |
| download | linux-dev-97fd311a2615d8f35e796b11a14b6cf3d335d423.tar.xz linux-dev-97fd311a2615d8f35e796b11a14b6cf3d335d423.zip | |
wl12xx: don't allow scanning while device is in ROC
return EBUSY on scan when there is any role
in ROC (not necessarily the one we are going
to use)
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 85bbe7f4f517..1d5f2d5614fb 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/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; |