iwlwifi: transport's tx_agg_disable must be atomic

At least as long as it is called from the reclaim
flow (iwlagn_check_ratid_empty) it must be atomic.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 609949f0299c5658a0542eaca798d16360f3f5a4..ed6ab449e439c5f14557e09b7c3e1e77ffb7893f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -306,7 +306,7 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
  *     ready and a successful ADDBA response has been received.
  *     May sleep
  * @tx_agg_disable: de-configure a Tx queue to send AMPDUs
- *     May sleep
+ *     Must be atomic
  * @free: release all the ressource for the transport layer itself such as
  *     irq, tasklet etc... From this point on, the device may not issue
  *     any interrupt (incl. RFKILL).
@@ -497,8 +497,6 @@ static inline int iwl_trans_reclaim(struct iwl_trans *trans, int sta_id,
 static inline int iwl_trans_tx_agg_disable(struct iwl_trans *trans,
                                            int sta_id, int tid)
 {
-       might_sleep();
-
        if (trans->state != IWL_TRANS_FW_ALIVE)
                IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);