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

Commit 11eb5429 authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by Luciano Coelho
Browse files

wl1271: Enable 11a support always, prevent scanning for unsupporting chips 



This patch always enables 11a band towards the mac80211, but prevents scanning
(and hence the usage of) 11a band channels if the chipset does not support it.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
parent 65cddbf1

drivers/net/wireless/wl12xx/wl1271_init.c

+7 −8
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static int wl1271_init_hwenc_config(struct wl1271 *wl) 
int wl1271_init_templates_config(struct wl1271 *wl)

{

	int ret, i;

	size_t size;



	/* send empty templates for fw memory reservation */

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4, NULL,
@@ -61,14 +62,12 @@ int wl1271_init_templates_config(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	if (wl->enable_11a) {

		size_t size = sizeof(struct wl12xx_probe_req_template);

	size = sizeof(struct wl12xx_probe_req_template);

	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_5,

				      NULL, size, 0,

				      WL1271_RATE_AUTOMATIC);

	if (ret < 0)

		return ret;

	}



	ret = wl1271_cmd_template_set(wl, CMD_TEMPL_NULL_DATA, NULL,

				      sizeof(struct wl12xx_null_data_template),

drivers/net/wireless/wl12xx/wl1271_main.c

+1 −3
Original line number Diff line number Diff line
@@ -2403,8 +2403,6 @@ int wl1271_init_ieee80211(struct wl1271 *wl) 
		BIT(NL80211_IFTYPE_ADHOC);

	wl->hw->wiphy->max_scan_ssids = 1;

	wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &wl1271_band_2ghz;



	if (wl->enable_11a)

	wl->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &wl1271_band_5ghz;



	wl->hw->queues = 4;