From: Johannes Berg Date: Tue, 3 Apr 2012 18:38:44 +0000 (+0200) Subject: iwlwifi: move watchdog definitions to config X-Git-Tag: v3.12-rc1~3113^2~267^2^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1f80a8c3b4cfd40eb20a52fd86f0ff9faffdec0;p=kernel%2Fkernel-generic.git iwlwifi: move watchdog definitions to config Since they're used in the config, they should be declared in iwl-config.h. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy --- diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h index 71e6285..70a8f9f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/iwlwifi/iwl-config.h @@ -112,6 +112,12 @@ enum iwl_led_mode { #define IWL_MAX_PLCP_ERR_THRESHOLD_MAX 255 #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE 0 +/* TX queue watchdog timeouts in mSecs */ +#define IWL_WATCHHDOG_DISABLED 0 +#define IWL_DEF_WD_TIMEOUT 2000 +#define IWL_LONG_WD_TIMEOUT 10000 +#define IWL_MAX_WD_TIMEOUT 120000 + /* * @max_ll_items: max number of OTP blocks diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 80cd942..7994be3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -535,12 +535,6 @@ struct iwl_event_log { #define IWL_DELAY_NEXT_FORCE_RF_RESET (HZ*3) -/* TX queue watchdog timeouts in mSecs */ -#define IWL_WATCHHDOG_DISABLED (0) -#define IWL_DEF_WD_TIMEOUT (2000) -#define IWL_LONG_WD_TIMEOUT (10000) -#define IWL_MAX_WD_TIMEOUT (120000) - /* BT Antenna Coupling Threshold (dB) */ #define IWL_BT_ANTENNA_COUPLING_THRESHOLD (35)