iwlagn: move iwl_stop / wake_queue to the upper layer

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / iwl-trans-int-pcie.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h b/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
index fc337547354177234b8cbbf377fa1f0c5bcc453c..49cd5a7682805ca88ebd17f072142ea7a25a51b3 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
@@ -375,12 +375,9 @@ static inline void iwl_wake_queue(struct iwl_trans *trans,
        struct iwl_trans_pcie *trans_pcie =
                IWL_TRANS_GET_PCIE_TRANS(trans);
 
-       if (unlikely(!trans->shrd->mac80211_registered))
-               return;
-
        if (test_and_clear_bit(hwq, trans_pcie->queue_stopped))
                if (atomic_dec_return(&trans_pcie->queue_stop_count[ac]) <= 0)
-                       ieee80211_wake_queue(trans->shrd->hw, ac);
+                       iwl_wake_sw_queue(priv(trans), ac);
 }
 
 static inline void iwl_stop_queue(struct iwl_trans *trans,
@@ -392,12 +389,9 @@ static inline void iwl_stop_queue(struct iwl_trans *trans,
        struct iwl_trans_pcie *trans_pcie =
                IWL_TRANS_GET_PCIE_TRANS(trans);
 
-       if (unlikely(!trans->shrd->mac80211_registered))
-               return;
-
        if (!test_and_set_bit(hwq, trans_pcie->queue_stopped))
                if (atomic_inc_return(&trans_pcie->queue_stop_count[ac]) > 0)
-                       ieee80211_stop_queue(trans->shrd->hw, ac);
+                       iwl_stop_sw_queue(priv(trans), ac);
 }
 
 #ifdef ieee80211_stop_queue