From 93b430e6b4fb3f50a0c6b8fbeb79f4e7799e35f1 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Sun, 17 Jun 2012 16:00:22 +0300 Subject: [PATCH] --- yaml --- r: 314751 b: refs/heads/master c: 901787c1674ee5d35c7c3713efbc009c72f43971 h: refs/heads/master i: 314749: 56ed814d259417cbe1f762c28a6d1947158eb5b3 314747: 7df3724d50335a5d865ac59920f9e556d4d4bd93 314743: bbc06c7d19f168c47797ebbeecd740bf36dfbc42 314735: 1c46a4d9ee2c5a17717c2a1a695d92650046b792 314719: 88d4a56a05f7daea71bfc7ecfcc60467d9958f7b 314687: 4f1be06df2b798822c34f8fcc8ef71991dfe5659 314623: 6498535608260fbd1777a21e6acac17b05abfbec v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-op-mode.h | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ac4499510ef0..022f32ac7d32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9d364de1aed8f7e81b3e67fdf3015533bfc76b1 +refs/heads/master: 901787c1674ee5d35c7c3713efbc009c72f43971 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/trunk/drivers/net/wireless/iwlwifi/iwl-op-mode.h index cd9ef114d3a3..64886f95664f 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-op-mode.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-op-mode.h @@ -111,22 +111,25 @@ struct iwl_cfg; * May sleep * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the * HCMD the this Rx responds to. - * Must be atomic. + * Must be atomic and called with BH disabled. * @queue_full: notifies that a HW queue is full. - * Must be atomic + * Must be atomic and called with BH disabled. * @queue_not_full: notifies that a HW queue is not full any more. - * Must be atomic + * Must be atomic and called with BH disabled. * @hw_rf_kill:notifies of a change in the HW rf kill switch. True means that * the radio is killed. Must be atomic. * @free_skb: allows the transport layer to free skbs that haven't been * reclaimed by the op_mode. This can happen when the driver is freed and * there are Tx packets pending in the transport layer. * Must be atomic - * @nic_error: error notification. Must be atomic - * @cmd_queue_full: Called when the command queue gets full. Must be atomic. + * @nic_error: error notification. Must be atomic and must be called with BH + * disabled. + * @cmd_queue_full: Called when the command queue gets full. Must be atomic and + * called with BH disabled. * @nic_config: configure NIC, called before firmware is started. * May sleep - * @wimax_active: invoked when WiMax becomes active. Must be atomic. + * @wimax_active: invoked when WiMax becomes active. Must be atomic and called + * with BH disabled. */ struct iwl_op_mode_ops { struct iwl_op_mode *(*start)(struct iwl_trans *trans, @@ -165,7 +168,6 @@ struct iwl_op_mode { static inline void iwl_op_mode_stop(struct iwl_op_mode *op_mode) { might_sleep(); - op_mode->ops->stop(op_mode); }