]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
mwifiex: release semaphore acquired for internal scan operation
authorAmitkumar Karwar <akarwar@marvell.com>
Tue, 28 Aug 2012 03:32:51 +0000 (20:32 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Sep 2012 19:03:40 +0000 (15:03 -0400)
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>
drivers/net/wireless/mwifiex/init.c

index fad2c8d2bddedb69c84dcc2bf0d3fd16c89e1bca..c510563dc00dc12bd7b89ff59cba16d1bab45cc5 100644 (file)
@@ -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;
        }