Commit 564b344c authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlwifi: change default led mode for different devices 



Set the default led mode for different devices.

For the newer devices such as 6000g2a, 6000g2b and newer,
the default led mode is On/Off instead of blinking.

The led_mode still can be control through module parameter
  0: system default
  1: On/Off
  2: blinking

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 05433df2

drivers/net/wireless/iwlwifi/iwl-1000.c

+4 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.ht_params = &iwl1000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl1000_bg_cfg = {
@@ -302,6 +303,7 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl100_bgn_cfg = {
@@ -318,6 +320,7 @@ struct iwl_cfg iwl100_bgn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.ht_params = &iwl1000_ht_params,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl100_bg_cfg = {
@@ -333,6 +336,7 @@ struct iwl_cfg iwl100_bg_cfg = { 
	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.led_mode = IWL_LED_RF_STATE,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-3945.c

+2 −0
Original line number Diff line number Diff line
@@ -2788,6 +2788,7 @@ static struct iwl_cfg iwl3945_bg_cfg = { 
	.ops = &iwl3945_ops,

	.mod_params = &iwl3945_mod_params,

	.base_params = &iwl3945_base_params,

	.led_mode = IWL_LED_BLINK,

};



static struct iwl_cfg iwl3945_abg_cfg = {
@@ -2800,6 +2801,7 @@ static struct iwl_cfg iwl3945_abg_cfg = { 
	.ops = &iwl3945_ops,

	.mod_params = &iwl3945_mod_params,

	.base_params = &iwl3945_base_params,

	.led_mode = IWL_LED_BLINK,

};



DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −0
Original line number Diff line number Diff line
@@ -2636,6 +2636,7 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.ops = &iwl4965_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl4965_base_params,

	.led_mode = IWL_LED_BLINK,

	/*

	 * Force use of chains B and C for scan RX on 5 GHz band

	 * because the device has off-channel reception on chain A.

drivers/net/wireless/iwlwifi/iwl-5000.c

+7 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5100_bgn_cfg = {
@@ -552,6 +553,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5100_abg_cfg = {
@@ -567,6 +569,7 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5100_agn_cfg = {
@@ -583,6 +586,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5350_agn_cfg = {
@@ -599,6 +603,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5150_agn_cfg = {
@@ -616,6 +621,7 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl5150_abg_cfg = {
@@ -632,6 +638,7 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-6000.c

+18 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6000g2a_2abg_cfg = {
@@ -584,6 +585,7 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = { 
	.base_params = &iwl6000_base_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6000g2a_2bg_cfg = {
@@ -601,6 +603,7 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = { 
	.base_params = &iwl6000_base_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6000g2b_2agn_cfg = {
@@ -620,6 +623,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -640,6 +644,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = { 
	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -661,6 +666,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -681,6 +687,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = { 
	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -702,6 +709,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = { 
	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -722,6 +730,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = { 
	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.need_temp_offset_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -744,6 +753,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.base_params = &iwl6000_base_params,

	.ht_params = &iwl6000_ht_params,

	.pa_type = IWL_PA_INTERNAL,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6000i_2abg_cfg = {
@@ -760,6 +770,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.pa_type = IWL_PA_INTERNAL,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6000i_2bg_cfg = {
@@ -776,6 +787,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6000_base_params,

	.pa_type = IWL_PA_INTERNAL,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6050_2agn_cfg = {
@@ -793,6 +805,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.base_params = &iwl6050_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6050g2_bgn_cfg = {
@@ -810,6 +823,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { 
	.base_params = &iwl6050_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_RF_STATE,

};



struct iwl_cfg iwl6050_2abg_cfg = {
@@ -826,6 +840,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl6050_base_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl6000_3agn_cfg = {
@@ -843,6 +858,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.base_params = &iwl6000_base_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_BLINK,

};



struct iwl_cfg iwl130_bgn_cfg = {
@@ -861,6 +877,7 @@ struct iwl_cfg iwl130_bgn_cfg = { 
	.bt_params = &iwl6000_bt_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};
@@ -880,6 +897,7 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.base_params = &iwl6000_coex_base_params,

	.bt_params = &iwl6000_bt_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	/* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */

	.scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,

};