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

Commit f5d2ff43 authored by Andrey Shevchenko's avatar Andrey Shevchenko Committed by Kalle Valo
Browse files

qtnfmac: fix bg_scan_period parameter processing 



Do not process bg_scan_period parameter in qtnfmac driver.
Pass correct values as is. In the case of invalid values
pass default value. Leave further processing to firmware.

Signed-off-by: default avatarAndrey Shevchenko <ashevchenko@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b60769e2

drivers/net/wireless/quantenna/qtnfmac/commands.c

+3 −5
Original line number Diff line number Diff line
@@ -2339,13 +2339,11 @@ int qtnf_cmd_send_connect(struct qtnf_vif *vif, 
	else

		eth_zero_addr(cmd->prev_bssid);



	if ((sme->bg_scan_period > 0) &&

	    (sme->bg_scan_period <= QTNF_MAX_BG_SCAN_PERIOD))

	if ((sme->bg_scan_period >= 0) &&

	    (sme->bg_scan_period <= SHRT_MAX))

		cmd->bg_scan_period = cpu_to_le16(sme->bg_scan_period);

	else if (sme->bg_scan_period == -1)

		cmd->bg_scan_period = cpu_to_le16(QTNF_DEFAULT_BG_SCAN_PERIOD);

	else

		cmd->bg_scan_period = 0; /* disabled */

		cmd->bg_scan_period = cpu_to_le16(-1); /* use default value */



	if (sme->flags & ASSOC_REQ_DISABLE_HT)

		connect_flags |= QLINK_STA_CONNECT_DISABLE_HT;

drivers/net/wireless/quantenna/qtnfmac/core.h

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ 
#define QTNF_MAX_VSIE_LEN		255

#define QTNF_MAX_INTF			8

#define QTNF_MAX_EVENT_QUEUE_LEN	255

#define QTNF_DEFAULT_BG_SCAN_PERIOD	300

#define QTNF_MAX_BG_SCAN_PERIOD		0xffff

#define QTNF_SCAN_TIMEOUT_SEC		15



#define QTNF_DEF_BSS_PRIORITY		0