summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2012-08-28 03:32:51 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2012-09-07 19:03:40 (GMT)
commit26fc36ab756d305274f056755705478dc4dda521 (patch)
tree84cb37338b4ebcbd7a49b63227f2e92e0ac6bc6a
parent21cd54a34070c46e87960ce2b50aba9e2f3ecda4 (diff)
downloadlinux-26fc36ab756d305274f056755705478dc4dda521.tar.xz
mwifiex: release semaphore acquired for internal scan operation
If "iw connect" command is fired for station interface, when heavy traffic is running on AP interface, internal scan operation performed before actual association is aborted. In this case we missed to release semaphore. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kiran Divekar <dkiran@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwifiex/init.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index fad2c8d2b..c510563 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -92,6 +92,11 @@ static void scan_delay_timer_fn(unsigned long data)
kfree(priv->user_scan_cfg);
priv->user_scan_cfg = NULL;
}
+
+ if (priv->scan_pending_on_block) {
+ priv->scan_pending_on_block = false;
+ up(&priv->async_sem);
+ }
goto done;
}