Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0b46192 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e755f882

drivers/net/wireless/iwlwifi/iwl-trans.h

+1 −3
Original line number Diff line number Diff line
@@ -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);