struct mwifiex_adapter *adapter)
 {
        unsigned long dev_queue_flags;
-       unsigned int i;
 
        spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);
-
-       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);
-       }
-
+       netif_tx_wake_all_queues(netdev);
        spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);
 }
 
                                        struct mwifiex_adapter *adapter)
 {
        unsigned long dev_queue_flags;
-       unsigned int i;
 
        spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);
-
-       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);
-       }
-
+       netif_tx_stop_all_queues(netdev);
        spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);
 }