aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2011-08-30 14:58:10 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2011-08-31 03:13:02 -0400
commit1b1e6ee300b84eff3c7b0ee8de2396eb815f1b9d (patch)
tree0aea240c84aae69ea9eeb163032cafd1a28e401a
parent8bdfbf40721a4338eb4f6dec55b3205188c45973 (diff)
ath6kl: Return error from wmi.c instead of -EIO in ath6kl_cfg80211_scan
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/cfg80211.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 2136899561df..e867a7a5c91d 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -759,12 +759,13 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
759 return -EIO; 759 return -EIO;
760 760
761 if (!ar->usr_bss_filter) { 761 if (!ar->usr_bss_filter) {
762 if (ath6kl_wmi_bssfilter_cmd(ar->wmi, 762 ret = ath6kl_wmi_bssfilter_cmd(
763 (test_bit(CONNECTED, &ar->flag) ? 763 ar->wmi,
764 ALL_BUT_BSS_FILTER : 764 (test_bit(CONNECTED, &ar->flag) ?
765 ALL_BSS_FILTER), 0) != 0) { 765 ALL_BUT_BSS_FILTER : ALL_BSS_FILTER), 0);
766 if (ret) {
766 ath6kl_err("couldn't set bss filtering\n"); 767 ath6kl_err("couldn't set bss filtering\n");
767 return -EIO; 768 return ret;
768 } 769 }
769 } 770 }
770 771
@@ -807,11 +808,10 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
807 channels[i] = request->channels[i]->center_freq; 808 channels[i] = request->channels[i]->center_freq;
808 } 809 }
809 810
810 if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0, 811 ret = ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0,
811 false, 0, 0, n_channels, channels) != 0) { 812 false, 0, 0, n_channels, channels);
813 if (ret)
812 ath6kl_err("wmi_startscan_cmd failed\n"); 814 ath6kl_err("wmi_startscan_cmd failed\n");
813 ret = -EIO;
814 }
815 815
816 ar->scan_req = request; 816 ar->scan_req = request;
817 817