diff mbox

mwifiex: fix scan_block flag handling

Message ID 1467201760-12204-1-git-send-email-akarwar@marvell.com (mailing list archive)
State Accepted
Commit b74d6e740be36d6d0c05f3386520fb44bae886b3
Delegated to: Kalle Valo
Headers show

Commit Message

Amitkumar Karwar June 29, 2016, 12:02 p.m. UTC 
scan_block flag is used to block scan operation when 4 way handshake
is in progress. Sometimes it doesn't get cleared due to incomplete
association. An example is assoc request/response is done, but add key
operation get canceled in some corner cases. As a result, further
association/scan operations are blocked.

This patch fixes the problem by clearing scan_block flag.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Xinming Hu <huxm@marvell.com>
---
 drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Kalle Valo July 8, 2016, 1:44 p.m. UTC | #1 
Amitkumar Karwar <akarwar@marvell.com> wrote:
> scan_block flag is used to block scan operation when 4 way handshake
> is in progress. Sometimes it doesn't get cleared due to incomplete
> association. An example is assoc request/response is done, but add key
> operation get canceled in some corner cases. As a result, further
> association/scan operations are blocked.
> 
> This patch fixes the problem by clearing scan_block flag.
> 
> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
> Signed-off-by: Xinming Hu <huxm@marvell.com>

Thanks, 1 patch applied to wireless-drivers-next.git:

b74d6e740be3 mwifiex: fix scan_block flag handling
diff mbox

Patch

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index ff948a9..bbc0cfc 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -2209,6 +2209,9 @@  mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 		return -EALREADY;
 	}
 
+	if (priv->scan_block)
+		priv->scan_block = false;
+
 	if (adapter->surprise_removed || adapter->is_cmd_timedout) {
 		mwifiex_dbg(adapter, ERROR,
 			    "%s: Ignore connection.\t"
@@ -2427,6 +2430,9 @@  mwifiex_cfg80211_scan(struct wiphy *wiphy,
 		return -EBUSY;
 	}
 
+	if (!priv->wdev.current_bss && priv->scan_block)
+		priv->scan_block = false;
+
 	if (!mwifiex_stop_bg_scan(priv))
 		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy);