Skip to content

Commit

Permalink
ath6kl: Return error from wmi.c instead of -EIO in ath6kl_cfg80211_scan
Browse files Browse the repository at this point in the history
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  • Loading branch information
Jouni Malinen authored and Kalle Valo committed Aug 31, 2011
1 parent 8bdfbf4 commit 1b1e6ee
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/net/wireless/ath/ath6kl/cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -759,12 +759,13 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
return -EIO;

if (!ar->usr_bss_filter) {
if (ath6kl_wmi_bssfilter_cmd(ar->wmi,
(test_bit(CONNECTED, &ar->flag) ?
ALL_BUT_BSS_FILTER :
ALL_BSS_FILTER), 0) != 0) {
ret = ath6kl_wmi_bssfilter_cmd(
ar->wmi,
(test_bit(CONNECTED, &ar->flag) ?
ALL_BUT_BSS_FILTER : ALL_BSS_FILTER), 0);
if (ret) {
ath6kl_err("couldn't set bss filtering\n");
return -EIO;
return ret;
}
}

Expand Down Expand Up @@ -807,11 +808,10 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
channels[i] = request->channels[i]->center_freq;
}

if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0,
false, 0, 0, n_channels, channels) != 0) {
ret = ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0,
false, 0, 0, n_channels, channels);
if (ret)
ath6kl_err("wmi_startscan_cmd failed\n");
ret = -EIO;
}

ar->scan_req = request;

Expand Down

0 comments on commit 1b1e6ee

Please sign in to comment.