1 files changed, 28 insertions, 11 deletions

diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index b5d37a8caa09..39f03ce5a5b1 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -84,18 +84,19 @@ static void scan_delay_timer_fn(unsigned long data)
                 spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
 
                 if (priv->user_scan_cfg) {
-                        dev_dbg(priv->adapter->dev,
-                                "info: %s: scan aborted\n", __func__);
-                        cfg80211_scan_done(priv->scan_request, 1);
-                        priv->scan_request = NULL;
+                        if (priv->scan_request) {
+                                dev_dbg(priv->adapter->dev,
+                                        "info: aborting scan\n");
+                                cfg80211_scan_done(priv->scan_request, 1);
+                                priv->scan_request = NULL;
+                        } else {
+                                dev_dbg(priv->adapter->dev,
+                                        "info: scan already aborted\n");
+                        }
+
                         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;
         }
 
@@ -387,9 +388,17 @@ void mwifiex_wake_up_net_dev_queue(struct net_device *netdev,
                                         struct mwifiex_adapter *adapter)
 {
         unsigned long dev_queue_flags;
+        unsigned int i;
 
         spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);
-        netif_tx_wake_all_queues(netdev);
+
+        for (i = 0; i < netdev->num_tx_queues; i++) {
+                struct netdev_queue *txq = netdev_get_tx_queue(netdev, i);
+
+                if (netif_tx_queue_stopped(txq))
+                        netif_tx_wake_queue(txq);
+        }
+
         spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);
 }
 
@@ -400,9 +409,17 @@ void mwifiex_stop_net_dev_queue(struct net_device *netdev,
                                         struct mwifiex_adapter *adapter)
 {
         unsigned long dev_queue_flags;
+        unsigned int i;
 
         spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);
-        netif_tx_stop_all_queues(netdev);
+
+        for (i = 0; i < netdev->num_tx_queues; i++) {
+                struct netdev_queue *txq = netdev_get_tx_queue(netdev, i);
+
+                if (!netif_tx_queue_stopped(txq))
+                        netif_tx_stop_queue(txq);
+        }
+
         spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);
 }