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

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

ath6kl: Use correct max-scan-SSIDs limit 



The currently used firmware images support 16 SSIDs in the scan
request (indexes 0..15), so update the host driver to use the same
limit to allow some more SSIDs to be scanned per request. In addition,
change the max-index to max-SSIDs to make it easier to understand the
implementation and fix couple of off-by-one checks that could limit
the maximum number of entries too strictly.

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

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

+4 −4
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static int ath6kl_set_probed_ssids(struct ath6kl *ar, 
{

	u8 i;



	if (n_ssids > MAX_PROBED_SSID_INDEX)

	if (n_ssids > MAX_PROBED_SSIDS)

		return -EINVAL;



	for (i = 0; i < n_ssids; i++) {
@@ -900,7 +900,7 @@ static int ath6kl_set_probed_ssids(struct ath6kl *ar, 
	}



	/* Make sure no old entries are left behind */

	for (i = n_ssids; i < MAX_PROBED_SSID_INDEX; i++) {

	for (i = n_ssids; i < MAX_PROBED_SSIDS; i++) {

		ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, i,

					  DISABLE_SSID_FLAG, 0, NULL);

	}
@@ -3470,7 +3470,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 
	}



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

	wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;

	wiphy->max_scan_ssids = MAX_PROBED_SSIDS;

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

	switch (ar->hw.cap) {

	case WMI_11AN_CAP:
@@ -3527,7 +3527,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 
	wiphy->wowlan.pattern_min_len = 1;

	wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;



	wiphy->max_sched_scan_ssids = MAX_PROBED_SSID_INDEX;

	wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;



	ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |

			    WIPHY_FLAG_HAVE_AP_SME |

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

+1 −1
Original line number Diff line number Diff line
@@ -1995,7 +1995,7 @@ int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 if_idx, u8 index, u8 flag, 
	struct wmi_probed_ssid_cmd *cmd;

	int ret;



	if (index > MAX_PROBED_SSID_INDEX)

	if (index >= MAX_PROBED_SSIDS)

		return -EINVAL;



	if (ssid_len > sizeof(cmd->ssid))

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

+2 −2
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ struct wmi_bss_filter_cmd { 
} __packed;



/* WMI_SET_PROBED_SSID_CMDID */

#define MAX_PROBED_SSID_INDEX   9

#define MAX_PROBED_SSIDS   16



enum wmi_ssid_flag {

	/* disables entry */
@@ -992,7 +992,7 @@ enum wmi_ssid_flag { 
};



struct wmi_probed_ssid_cmd {

	/* 0 to MAX_PROBED_SSID_INDEX */

	/* 0 to MAX_PROBED_SSIDS - 1 */

	u8 entry_index;



	/* see, enum wmi_ssid_flg */