Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/ath/ath6kl/cfg80211.c

+9 −9
Original line number Diff line number Diff line
@@ -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,

		ret = ath6kl_wmi_bssfilter_cmd(

			ar->wmi,

			(test_bit(CONNECTED, &ar->flag) ?

					     ALL_BUT_BSS_FILTER :

					     ALL_BSS_FILTER), 0) != 0) {

			 ALL_BUT_BSS_FILTER : ALL_BSS_FILTER), 0);

		if (ret) {

			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, 
			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;