mwifiex: remove low priority scan handling

We have a logic in driver to delay or abort low priority scan
to serve Tx traffic effectively. With scan channel
gap support added, firmware now allows driver to send Tx data while
scan operation is in progress. Hence low priority scan handling
in driver is not required now. This patch removes related code.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 10 deletions

diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 651fd8cc4c7f..e9cd4ab4902d 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -90,12 +90,6 @@ enum {
 
 #define MWIFIEX_MAX_TOTAL_SCAN_TIME     (MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S)
 
-#define MWIFIEX_MAX_SCAN_DELAY_CNT                      50
-#define MWIFIEX_MAX_EMPTY_TX_Q_CNT                      10
-#define MWIFIEX_SCAN_DELAY_MSEC                         20
-
-#define MWIFIEX_MIN_TX_PENDING_TO_CANCEL_SCAN           2
-
 #define RSN_GTK_OUI_OFFSET                              2
 
 #define MWIFIEX_OUI_NOT_PRESENT                 0
@@ -561,7 +555,6 @@ struct mwifiex_private {
         u16 proberesp_idx;
         u16 assocresp_idx;
         u16 rsn_idx;
-        struct timer_list scan_delay_timer;
         u8 ap_11n_enabled;
         u8 ap_11ac_enabled;
         u32 mgmt_frame_mask;
@@ -816,8 +809,6 @@ struct mwifiex_adapter {
         spinlock_t queue_lock;          /* lock for tx queues */
         u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
         u16 max_mgmt_ie_index;
-        u8 scan_delay_cnt;
-        u8 empty_tx_q_cnt;
         const struct firmware *cal_data;
         struct device_node *dt_node;
 
@@ -829,7 +820,6 @@ struct mwifiex_adapter {
         u32 usr_dot_11ac_dev_cap_a;
         u32 usr_dot_11ac_mcs_support;
 
-        atomic_t is_tx_received;
         atomic_t pending_bridged_pkts;
         struct semaphore *card_sem;
         bool ext_scan;