Commit 1b1e6ee3 authored by Jouni Malinen's avatar Jouni Malinen Committed by Kalle Valo

ath6kl: Return error from wmi.c instead of -EIO in ath6kl_cfg80211_scan

Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 8bdfbf40
...@@ -759,12 +759,13 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, ...@@ -759,12 +759,13 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
return -EIO; return -EIO;
if (!ar->usr_bss_filter) { if (!ar->usr_bss_filter) {
if (ath6kl_wmi_bssfilter_cmd(ar->wmi, ret = ath6kl_wmi_bssfilter_cmd(
(test_bit(CONNECTED, &ar->flag) ? ar->wmi,
ALL_BUT_BSS_FILTER : (test_bit(CONNECTED, &ar->flag) ?
ALL_BSS_FILTER), 0) != 0) { ALL_BUT_BSS_FILTER : ALL_BSS_FILTER), 0);
if (ret) {
ath6kl_err("couldn't set bss filtering\n"); ath6kl_err("couldn't set bss filtering\n");
return -EIO; return ret;
} }
} }
...@@ -807,11 +808,10 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, ...@@ -807,11 +808,10 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
channels[i] = request->channels[i]->center_freq; channels[i] = request->channels[i]->center_freq;
} }
if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0, ret = ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0,
false, 0, 0, n_channels, channels) != 0) { false, 0, 0, n_channels, channels);
if (ret)
ath6kl_err("wmi_startscan_cmd failed\n"); ath6kl_err("wmi_startscan_cmd failed\n");
ret = -EIO;
}
ar->scan_req = request; ar->scan_req = request;
......
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