aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-6000.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 808942cc2991..a848ca06dc6f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -564,6 +564,7 @@ struct iwl_cfg iwl6005_2agn_cfg = {
564 .need_dc_calib = true, 564 .need_dc_calib = true,
565 .need_temp_offset_calib = true, 565 .need_temp_offset_calib = true,
566 .led_mode = IWL_LED_RF_STATE, 566 .led_mode = IWL_LED_RF_STATE,
567 .use_new_eeprom_reading = true,
567}; 568};
568 569
569struct iwl_cfg iwl6005_2abg_cfg = { 570struct iwl_cfg iwl6005_2abg_cfg = {
@@ -579,6 +580,7 @@ struct iwl_cfg iwl6005_2abg_cfg = {
579 .need_dc_calib = true, 580 .need_dc_calib = true,
580 .need_temp_offset_calib = true, 581 .need_temp_offset_calib = true,
581 .led_mode = IWL_LED_RF_STATE, 582 .led_mode = IWL_LED_RF_STATE,
583 .use_new_eeprom_reading = true,
582}; 584};
583 585
584struct iwl_cfg iwl6005_2bg_cfg = { 586struct iwl_cfg iwl6005_2bg_cfg = {
@@ -594,6 +596,7 @@ struct iwl_cfg iwl6005_2bg_cfg = {
594 .need_dc_calib = true, 596 .need_dc_calib = true,
595 .need_temp_offset_calib = true, 597 .need_temp_offset_calib = true,
596 .led_mode = IWL_LED_RF_STATE, 598 .led_mode = IWL_LED_RF_STATE,
599 .use_new_eeprom_reading = true,
597}; 600};
598 601
599struct iwl_cfg iwl6030_2agn_cfg = { 602struct iwl_cfg iwl6030_2agn_cfg = {
@@ -614,6 +617,7 @@ struct iwl_cfg iwl6030_2agn_cfg = {
614 .adv_pm = true, 617 .adv_pm = true,
615 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 618 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
616 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 619 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
620 .use_new_eeprom_reading = true,
617}; 621};
618 622
619struct iwl_cfg iwl6030_2abg_cfg = { 623struct iwl_cfg iwl6030_2abg_cfg = {
@@ -633,6 +637,7 @@ struct iwl_cfg iwl6030_2abg_cfg = {
633 .adv_pm = true, 637 .adv_pm = true,
634 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 638 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
635 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 639 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
640 .use_new_eeprom_reading = true,
636}; 641};
637 642
638struct iwl_cfg iwl6030_2bgn_cfg = { 643struct iwl_cfg iwl6030_2bgn_cfg = {
@@ -653,6 +658,7 @@ struct iwl_cfg iwl6030_2bgn_cfg = {
653 .adv_pm = true, 658 .adv_pm = true,
654 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 659 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
655 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 660 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
661 .use_new_eeprom_reading = true,
656}; 662};
657 663
658struct iwl_cfg iwl6030_2bg_cfg = { 664struct iwl_cfg iwl6030_2bg_cfg = {
@@ -672,6 +678,7 @@ struct iwl_cfg iwl6030_2bg_cfg = {
672 .adv_pm = true, 678 .adv_pm = true,
673 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 679 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
674 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 680 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
681 .use_new_eeprom_reading = true,
675}; 682};
676 683
677struct iwl_cfg iwl1030_bgn_cfg = { 684struct iwl_cfg iwl1030_bgn_cfg = {
@@ -692,6 +699,7 @@ struct iwl_cfg iwl1030_bgn_cfg = {
692 .adv_pm = true, 699 .adv_pm = true,
693 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 700 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
694 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 701 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
702 .use_new_eeprom_reading = true,
695}; 703};
696 704
697struct iwl_cfg iwl1030_bg_cfg = { 705struct iwl_cfg iwl1030_bg_cfg = {
@@ -711,6 +719,7 @@ struct iwl_cfg iwl1030_bg_cfg = {
711 .adv_pm = true, 719 .adv_pm = true,
712 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 720 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
713 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 721 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
722 .use_new_eeprom_reading = true,
714}; 723};
715 724
716/* 725/*
@@ -793,6 +802,7 @@ struct iwl_cfg iwl6150_bgn_cfg = {
793 .ht_params = &iwl6000_ht_params, 802 .ht_params = &iwl6000_ht_params,
794 .need_dc_calib = true, 803 .need_dc_calib = true,
795 .led_mode = IWL_LED_RF_STATE, 804 .led_mode = IWL_LED_RF_STATE,
805 .use_new_eeprom_reading = true,
796}; 806};
797 807
798struct iwl_cfg iwl6050_2abg_cfg = { 808struct iwl_cfg iwl6050_2abg_cfg = {
@@ -841,6 +851,7 @@ struct iwl_cfg iwl130_bgn_cfg = {
841 .adv_pm = true, 851 .adv_pm = true,
842 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 852 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
843 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 853 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
854 .use_new_eeprom_reading = true,
844}; 855};
845 856
846struct iwl_cfg iwl130_bg_cfg = { 857struct iwl_cfg iwl130_bg_cfg = {
@@ -859,6 +870,7 @@ struct iwl_cfg iwl130_bg_cfg = {
859 .adv_pm = true, 870 .adv_pm = true,
860 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */ 871 /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
861 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A, 872 .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
873 .use_new_eeprom_reading = true,
862}; 874};
863 875
864MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); 876MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));