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

Commit de09364e authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: block scan request during heavy Tx traffic 



Currently scan operation is delayed/aborted based on Tx traffic
consistency. This decision is taken after receiving scan
response of first scan command from FW. But when heavy traffic
is running, we can not even afford to send first scan command
and go off channel for 30msec. We will block scan request in
this case.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 22c22d27

drivers/net/wireless/mwifiex/cfg80211.c

+6 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,12 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, 


	wiphy_dbg(wiphy, "info: received scan request on %s\n", dev->name);



	if (atomic_read(&priv->wmm.tx_pkts_queued) >=

	    MWIFIEX_MIN_TX_PENDING_TO_CANCEL_SCAN) {

		dev_dbg(priv->adapter->dev, "scan rejected due to traffic\n");

		return -EBUSY;

	}



	priv->scan_request = request;



	priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg),

drivers/net/wireless/mwifiex/main.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ enum { 
#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