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

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

ath6kl: Use set_appie command to add Probe Request IEs 



Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent f9e5f05c

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -776,6 +776,16 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, 
						  request->ssids[i].ssid);

						  request->ssids[i].ssid);

	}

	}





	if (request->ie) {

		ret = ath6kl_wmi_set_appie_cmd(ar->wmi, WMI_FRAME_PROBE_REQ,

					       request->ie, request->ie_len);

		if (ret) {

			ath6kl_err("failed to set Probe Request appie for "

				   "scan");

			return ret;

		}

	}



	if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0,

	if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0,

				     false, 0, 0, 0, NULL) != 0) {

				     false, 0, 0, 0, NULL) != 0) {

		ath6kl_err("wmi_startscan_cmd failed\n");

		ath6kl_err("wmi_startscan_cmd failed\n");
@@ -1770,6 +1780,7 @@ struct wireless_dev *ath6kl_cfg80211_init(struct device *dev) 
	    BIT(NL80211_IFTYPE_ADHOC);

	    BIT(NL80211_IFTYPE_ADHOC);

	/* max num of ssids that can be probed during scanning */

	/* max num of ssids that can be probed during scanning */

	wdev->wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;

	wdev->wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;

	wdev->wiphy->max_scan_ie_len = 1000; /* FIX: what is correct limit? */

	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;

	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;

	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &ath6kl_band_5ghz;

	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &ath6kl_band_5ghz;

	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;

	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;

drivers/net/wireless/ath/ath6kl/wmi.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -2218,6 +2218,9 @@ int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u32 info_req_flags); 




int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi);

int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi);





int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,

			     u8 ie_len);



void *ath6kl_wmi_init(struct ath6kl *devt);

void *ath6kl_wmi_init(struct ath6kl *devt);

void ath6kl_wmi_shutdown(struct wmi *wmi);

void ath6kl_wmi_shutdown(struct wmi *wmi);