diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-12-27 10:01:09 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2025-01-13 15:26:39 +0100 |
| commit | 14eef4e2355920eea8c20424f9260a266f81f650 (patch) | |
| tree | cba121ae3dc82a1a12ae283e5d65c8dd00c5b22c /drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | |
| parent | 99baaf924a30b240622a42fdab0fff3ffa8138cc (diff) | |
wifi: iwlwifi: unify cmd_queue_full() into nic_error()
Except for some special handling in DVM, error dump and some
message behaviour, cmd_queue_full and nic_error are equivalent
now. Unify by giving a special error type, so DVM can continue
to differentiate.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241227095718.0222183504aa.Ie29cef75fbd91b64a43619bc36bd5b29c5b9f957@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h index 8febc949b610..3b4085d3aad2 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h @@ -51,11 +51,13 @@ struct iwl_cfg; * @IWL_ERR_TYPE_RESET_HS_TIMEOUT: reset handshake timed out, * any debug collection must happen synchronously as * the device will be shut down + * @IWL_ERR_TYPE_CMD_QUEUE_FULL: command queue was full */ enum iwl_fw_error_type { IWL_ERR_TYPE_IRQ, IWL_ERR_TYPE_NMI_FORCED, IWL_ERR_TYPE_RESET_HS_TIMEOUT, + IWL_ERR_TYPE_CMD_QUEUE_FULL, }; /** @@ -93,8 +95,6 @@ enum iwl_fw_error_type { * Must be atomic * @nic_error: error notification. Must be atomic and must be called with BH * disabled, unless the type is IWL_ERR_TYPE_RESET_HS_TIMEOUT - * @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. May sleep @@ -120,7 +120,6 @@ struct iwl_op_mode_ops { void (*free_skb)(struct iwl_op_mode *op_mode, struct sk_buff *skb); void (*nic_error)(struct iwl_op_mode *op_mode, enum iwl_fw_error_type type); - void (*cmd_queue_full)(struct iwl_op_mode *op_mode); void (*nic_config)(struct iwl_op_mode *op_mode); void (*wimax_active)(struct iwl_op_mode *op_mode); void (*time_point)(struct iwl_op_mode *op_mode, @@ -198,11 +197,6 @@ static inline void iwl_op_mode_nic_error(struct iwl_op_mode *op_mode, op_mode->ops->nic_error(op_mode, type); } -static inline void iwl_op_mode_cmd_queue_full(struct iwl_op_mode *op_mode) -{ - op_mode->ops->cmd_queue_full(op_mode); -} - static inline void iwl_op_mode_nic_config(struct iwl_op_mode *op_mode) { might_sleep(); |