Commit 3df74f46 authored by Yoni Divinsky's avatar Yoni Divinsky Committed by John W. Linville
Browse files

wlcore: add probe request templates for sched and one-shot scans 



The driver configures the firmware template for probe requests during
the scan process.  If the same template is used for one-shot and sched
scans they will override each other when running scans simultaneously.

This fix works only on firmwares later than X.3.9.2.112 for single
role and X.3.9.2.23 for multi-role.

[Some cleaning-up and renaming of the quirk to something smaller --
Luca.]

Signed-off-by: default avatarYoni Divinsky <yoni.divinsky@ti.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent b034fd6f

drivers/net/wireless/ti/wl12xx/main.c

+3 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl) 
			       wl->chip.id);



		wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |

			      WLCORE_QUIRK_DUAL_PROBE_TMPL |

			      WLCORE_QUIRK_TKIP_HEADER_SPACE;

		wl->sr_fw_name = WL127X_FW_NAME_SINGLE;

		wl->mr_fw_name = WL127X_FW_NAME_MULTI;
@@ -656,6 +657,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl) 
			     wl->chip.id);



		wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |

			      WLCORE_QUIRK_DUAL_PROBE_TMPL |

			      WLCORE_QUIRK_TKIP_HEADER_SPACE;

		wl->plt_fw_name = WL127X_PLT_FW_NAME;

		wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
@@ -680,6 +682,7 @@ static int wl12xx_identify_chip(struct wl1271 *wl) 


		/* wl128x requires TX blocksize alignment */

		wl->quirks |= WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN |

			      WLCORE_QUIRK_DUAL_PROBE_TMPL |

			      WLCORE_QUIRK_TKIP_HEADER_SPACE;



		wlcore_set_min_fw_ver(wl, WL128X_CHIP_VER, WL128X_IFTYPE_VER,

drivers/net/wireless/ti/wlcore/cmd.c

+11 −3
Original line number Diff line number Diff line
@@ -1007,12 +1007,14 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			       u8 role_id, u8 band,

			       const u8 *ssid, size_t ssid_len,

			       const u8 *ie, size_t ie_len)

			       const u8 *ie, size_t ie_len, bool sched_scan)

{

	struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);

	struct sk_buff *skb;

	int ret;

	u32 rate;

	u16 template_id_2_4 = CMD_TEMPL_CFG_PROBE_REQ_2_4;

	u16 template_id_5 = CMD_TEMPL_CFG_PROBE_REQ_5;



	skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,

				     ie, ie_len);
@@ -1023,14 +1025,20 @@ int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif, 


	wl1271_dump(DEBUG_SCAN, "PROBE REQ: ", skb->data, skb->len);



	if (!sched_scan &&

	    (wl->quirks & WLCORE_QUIRK_DUAL_PROBE_TMPL)) {

		template_id_2_4 = CMD_TEMPL_APP_PROBE_REQ_2_4;

		template_id_5 = CMD_TEMPL_APP_PROBE_REQ_5;

	}



	rate = wl1271_tx_min_rate_get(wl, wlvif->bitrate_masks[band]);

	if (band == IEEE80211_BAND_2GHZ)

		ret = wl1271_cmd_template_set(wl, role_id,

					      CMD_TEMPL_CFG_PROBE_REQ_2_4,

					      template_id_2_4,

					      skb->data, skb->len, 0, rate);

	else

		ret = wl1271_cmd_template_set(wl, role_id,

					      CMD_TEMPL_CFG_PROBE_REQ_5,

					      template_id_5,

					      skb->data, skb->len, 0, rate);



out:

drivers/net/wireless/ti/wlcore/cmd.h

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,

			       u8 role_id, u8 band,

			       const u8 *ssid, size_t ssid_len,

			       const u8 *ie, size_t ie_len);

			       const u8 *ie, size_t ie_len, bool sched_scan);

struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,

					      struct wl12xx_vif *wlvif,

					      struct sk_buff *skb);
@@ -172,8 +172,8 @@ enum cmd_templ { 
	CMD_TEMPL_PS_POLL,

	CMD_TEMPL_KLV,

	CMD_TEMPL_DISCONNECT,

	CMD_TEMPL_PROBE_REQ_2_4, /* for firmware internal use only */

	CMD_TEMPL_PROBE_REQ_5,   /* for firmware internal use only */

	CMD_TEMPL_APP_PROBE_REQ_2_4,

	CMD_TEMPL_APP_PROBE_REQ_5,

	CMD_TEMPL_BAR,           /* for firmware internal use only */

	CMD_TEMPL_CTS,           /*

				  * For CTS-to-self (FastCTS) mechanism

drivers/net/wireless/ti/wlcore/init.c

+16 −0
Original line number Diff line number Diff line
@@ -54,6 +54,22 @@ int wl1271_init_templates_config(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	if (wl->quirks & WLCORE_QUIRK_DUAL_PROBE_TMPL) {

		ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID,

					      CMD_TEMPL_APP_PROBE_REQ_2_4, NULL,

					      WL1271_CMD_TEMPL_MAX_SIZE,

					      0, WL1271_RATE_AUTOMATIC);

		if (ret < 0)

			return ret;



		ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID,

					      CMD_TEMPL_APP_PROBE_REQ_5, NULL,

					      WL1271_CMD_TEMPL_MAX_SIZE,

					      0, WL1271_RATE_AUTOMATIC);

		if (ret < 0)

			return ret;

	}



	ret = wl1271_cmd_template_set(wl, WL12XX_INVALID_ROLE_ID,

				      CMD_TEMPL_NULL_DATA, NULL,

				      sizeof(struct wl12xx_null_data_template),

drivers/net/wireless/ti/wlcore/scan.c

+3 −3
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct ieee80211_vif *vif, 
					 cmd->params.role_id, band,

					 wl->scan.ssid, wl->scan.ssid_len,

					 wl->scan.req->ie,

					 wl->scan.req->ie_len);

					 wl->scan.req->ie_len, false);

	if (ret < 0) {

		wl1271_error("PROBE request template failed");

		goto out;
@@ -722,7 +722,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, 
						 req->ssids[0].ssid,

						 req->ssids[0].ssid_len,

						 ies->ie[band],

						 ies->len[band]);

						 ies->len[band], true);

		if (ret < 0) {

			wl1271_error("2.4GHz PROBE request template failed");

			goto out;
@@ -736,7 +736,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl, 
						 req->ssids[0].ssid,

						 req->ssids[0].ssid_len,

						 ies->ie[band],

						 ies->len[band]);

						 ies->len[band], true);

		if (ret < 0) {

			wl1271_error("5GHz PROBE request template failed");

			goto out;