diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-05 14:24:41 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:13 -0500 |
commit | c977a33d84fb3d706faa0b62f9671f49b16dde34 (patch) | |
tree | 3ca14b303b8f8903591e4a5d08e02df642ca93c1 /drivers/net/wireless/iwlwifi | |
parent | df2f3216ccde52bb43df78e0b869a0dd1637cf15 (diff) |
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 <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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index e8ab8d8ca484..0197f31f3bec 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) | |||
229 | * @reclaim: free packet until ssn. Returns a list of freed packets. | 229 | * @reclaim: free packet until ssn. Returns a list of freed packets. |
230 | * Must be atomic | 230 | * Must be atomic |
231 | * @tx_agg_alloc: allocate resources for a TX BA session | 231 | * @tx_agg_alloc: allocate resources for a TX BA session |
232 | * May sleep | 232 | * Must be atomic |
233 | * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is | 233 | * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is |
234 | * ready and a successful ADDBA response has been received. | 234 | * ready and a successful ADDBA response has been received. |
235 | * May sleep | 235 | * May sleep |
@@ -474,8 +474,6 @@ static inline int iwl_trans_tx_agg_disable(struct iwl_trans *trans, | |||
474 | static inline int iwl_trans_tx_agg_alloc(struct iwl_trans *trans, | 474 | static inline int iwl_trans_tx_agg_alloc(struct iwl_trans *trans, |
475 | int sta_id, int tid) | 475 | int sta_id, int tid) |
476 | { | 476 | { |
477 | might_sleep(); | ||
478 | |||
479 | if (trans->state != IWL_TRANS_FW_ALIVE) | 477 | if (trans->state != IWL_TRANS_FW_ALIVE) |
480 | IWL_ERR(trans, "%s bad state = %d", __func__, trans->state); | 478 | IWL_ERR(trans, "%s bad state = %d", __func__, trans->state); |
481 | 479 | ||