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: Andrey Shevchenko <ashevchenko@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c
index e2fc57be1cdd3961e6643c8131c306e7092576f7..5eb143667539929ed7d0440f14fb6df991915131 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/commands.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c
@@ -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;

diff --git a/drivers/net/wireless/quantenna/qtnfmac/core.h b/drivers/net/wireless/quantenna/qtnfmac/core.h
index 3b884c80b6ab6284bda4113db3a4593fea94c753..214435448335cae1a4866651aa625a0c2af4c3f0 100644 (file)
--- a/drivers/net/wireless/quantenna/qtnfmac/core.h
+++ b/drivers/net/wireless/quantenna/qtnfmac/core.h
@@ -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