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

Commit f1f80a8c authored Apr 03, 2012 by Johannes Berg Committed by Wey-Yi Guy Apr 23, 2012

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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

parent 6c4e9262

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -112,6 +112,12 @@ enum iwl_led_mode {
	#define IWL_MAX_PLCP_ERR_THRESHOLD_MAX 255		#define IWL_MAX_PLCP_ERR_THRESHOLD_MAX 255
	#define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE 0		#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		* @max_ll_items: max number of OTP blocks

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

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -535,12 +535,6 @@ struct iwl_event_log {

	#define IWL_DELAY_NEXT_FORCE_RF_RESET (HZ*3)		#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) */		/* BT Antenna Coupling Threshold (dB) */
	#define IWL_BT_ANTENNA_COUPLING_THRESHOLD (35)		#define IWL_BT_ANTENNA_COUPLING_THRESHOLD (35)