From: Johannes Berg Date: Mon, 5 Mar 2012 19:24:41 +0000 (-0800) Subject: iwlwifi: transport's tx_agg_alloc must not sleep X-Git-Tag: v3.4-rc1~177^2~108^2~123 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c977a33d84fb3d706faa0b62f9671f49b16dde34;p=platform%2Fkernel%2Flinux-3.10.git iwlwifi: transport's tx_agg_alloc must not sleep The annotation/documentation is wrong, we call it in a context that can't sleep. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index e8ab8d8..0197f31 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h @@ -229,7 +229,7 @@ static inline void iwl_free_resp(struct iwl_host_cmd *cmd) * @reclaim: free packet until ssn. Returns a list of freed packets. * Must be atomic * @tx_agg_alloc: allocate resources for a TX BA session - * May sleep + * Must be atomic * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is * ready and a successful ADDBA response has been received. * May sleep @@ -474,8 +474,6 @@ static inline int iwl_trans_tx_agg_disable(struct iwl_trans *trans, static inline int iwl_trans_tx_agg_alloc(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);