Commit 35d7742f authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho

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: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 79aba1ba
...@@ -175,16 +175,17 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, ...@@ -175,16 +175,17 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif,
if (passive) if (passive)
scan_options |= WL1271_SCAN_OPT_PASSIVE; scan_options |= WL1271_SCAN_OPT_PASSIVE;
if (WARN_ON(wlvif->role_id == WL12XX_INVALID_ROLE_ID || if (wlvif->bss_type == BSS_TYPE_AP_BSS ||
wlvif->dev_role_id == WL12XX_INVALID_ROLE_ID)) { test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
ret = -EINVAL;
goto out;
}
if (test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
cmd->params.role_id = wlvif->role_id; cmd->params.role_id = wlvif->role_id;
else else
cmd->params.role_id = wlvif->dev_role_id; 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.scan_options = cpu_to_le16(scan_options);
cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req, cmd->params.n_ch = wl1271_get_scan_channels(wl, wl->scan.req,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment