From: Eliad Peller Date: Thu, 2 Feb 2012 11:54:26 +0000 (+0200) Subject: wl12xx: don't fail on AP scan X-Git-Tag: v3.4-rc1~177^2~108^2~351^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35d7742ff31609d655f8f8b3f869647006a2ac26;p=platform%2Fkernel%2Flinux-3.10.git wl12xx: don't fail on AP scan AP role uses its own role_id for scans, so there's no reason to fail the scan if dev_role_id is invalid. Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c index 848a165..e3566ca 100644 --- a/drivers/net/wireless/wl12xx/scan.c +++ b/drivers/net/wireless/wl12xx/scan.c @@ -175,16 +175,17 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, if (passive) scan_options |= WL1271_SCAN_OPT_PASSIVE; - if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID || - wlvif->dev_role_id == WL12XX_INVALID_ROLE_ID)) { - ret = -EINVAL; - goto out; - } - if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) + if (wlvif->bss_type == BSS_TYPE_AP_BSS || + test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) cmd->params.role_id = wlvif->role_id; else cmd->params.role_id = wlvif->dev_role_id; + if (WARN_ON(cmd->params.role_id == WL12XX_INVALID_ROLE_ID)) { + ret = -EINVAL; + goto out; + } + cmd->params.scan_options = cpu_to_le16(scan_options); cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req,