iwlwifi: fix typo 'IWL_WATCHHDOG_DISABLED'

Commit 7c5ba4a830cbb730770129b0004e2a06e47dbac5 ("iwlwifi: move queue
watchdog into transport") introduced the named constant
'IWL_WATCHHDOG_DISABLED'. Rename it to 'IWL_WATCHDOG_DISABLED'.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index ebdc8b93bc041a4470d898021175819d04b93bc8..c91b66c77972bf62d372ea8bcc7e35758ddc4776 100644 (file)
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -1347,7 +1347,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                trans_cfg.queue_watchdog_timeout =
                        priv->cfg->base_params->wd_timeout;
        else
-               trans_cfg.queue_watchdog_timeout = IWL_WATCHHDOG_DISABLED;
+               trans_cfg.queue_watchdog_timeout = IWL_WATCHDOG_DISABLED;
        trans_cfg.command_names = iwl_dvm_cmd_strings;
 
        ucode_flags = fw->ucode_capa.flags;

diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index e9accfccc0507a37d16192e02baf4be1c87d1f53..10e47938b6355a169faed72edf87ed314ea2eaf0 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -113,7 +113,7 @@ enum iwl_led_mode {
 #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE     0
 
 /* TX queue watchdog timeouts in mSecs */
-#define IWL_WATCHHDOG_DISABLED 0
+#define IWL_WATCHDOG_DISABLED  0
 #define IWL_DEF_WD_TIMEOUT     2000
 #define IWL_LONG_WD_TIMEOUT    10000
 #define IWL_MAX_WD_TIMEOUT     120000

diff --git a/drivers/net/wireless/iwlwifi/pcie/1000.c b/drivers/net/wireless/iwlwifi/pcie/1000.c
index 0269ea6a5c354026ac5d30370d9788414003d9a1..81b83f484f08318c505fb3648ef1a88b15615fcb 100644 (file)
--- a/drivers/net/wireless/iwlwifi/pcie/1000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/1000.c
@@ -64,7 +64,7 @@ static const struct iwl_base_params iwl1000_base_params = {
        .support_ct_kill_exit = true,
        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
        .chain_noise_scale = 1000,
-       .wd_timeout = IWL_WATCHHDOG_DISABLED,
+       .wd_timeout = IWL_WATCHDOG_DISABLED,
        .max_event_log_size = 128,
 };
 

diff --git a/drivers/net/wireless/iwlwifi/pcie/5000.c b/drivers/net/wireless/iwlwifi/pcie/5000.c
index 745a358ab8e8b92a2e016fd624fbeb627e635684..d1665fa6d15a0e7ce56fb7dcb28f73b4e7554220 100644 (file)
--- a/drivers/net/wireless/iwlwifi/pcie/5000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/5000.c
@@ -62,7 +62,7 @@ static const struct iwl_base_params iwl5000_base_params = {
        .led_compensation = 51,
        .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
        .chain_noise_scale = 1000,
-       .wd_timeout = IWL_WATCHHDOG_DISABLED,
+       .wd_timeout = IWL_WATCHDOG_DISABLED,
        .max_event_log_size = 512,
        .no_idle_support = true,
 };