Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
iwlwifi: fix device id registration for 6000 series 2x2 devices
Add device ids for 2x2 devices. Also fix antenna usage because these devices use
antennas A and B, not B and C.
Signed-off-by: Jay Sternberg <jay.e.sternberg@linux.intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
authored by Jay Sternberg and committed by John W. Linville 542cc793 209d889b
+4
-4
drivers/net/wireless/iwlwifi/iwl-6000.c
+4
-4
drivers/net/wireless/iwlwifi/iwl-6000.c
···
101
101
.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
102
102
.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
103
103
.mod_params = &iwl50_mod_params,
104
-
.valid_tx_ant = ANT_BC,
105
-
.valid_rx_ant = ANT_BC,
104
+
.valid_tx_ant = ANT_AB,
105
+
.valid_rx_ant = ANT_AB,
106
106
.need_pll_cfg = false,
107
107
};
108
108
···
117
117
.eeprom_ver = EEPROM_5000_EEPROM_VERSION,
118
118
.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
119
119
.mod_params = &iwl50_mod_params,
120
-
.valid_tx_ant = ANT_BC,
121
-
.valid_rx_ant = ANT_BC,
120
+
.valid_tx_ant = ANT_AB,
121
+
.valid_rx_ant = ANT_AB,
122
122
.need_pll_cfg = false,
123
123
};
124
124
+2
drivers/net/wireless/iwlwifi/iwl-agn.c
+2
drivers/net/wireless/iwlwifi/iwl-agn.c
···
3636
3636
{IWL_PCI_DEVICE(0x0085, 0x1112, iwl6000_2ag_cfg)},
3637
3637
{IWL_PCI_DEVICE(0x0082, 0x1122, iwl6000_2ag_cfg)},
3638
3638
{IWL_PCI_DEVICE(0x422B, PCI_ANY_ID, iwl6000_3agn_cfg)},
3639
+
{IWL_PCI_DEVICE(0x422C, PCI_ANY_ID, iwl6000_2agn_cfg)},
3639
3640
{IWL_PCI_DEVICE(0x4238, PCI_ANY_ID, iwl6000_3agn_cfg)},
3641
+
{IWL_PCI_DEVICE(0x4239, PCI_ANY_ID, iwl6000_2agn_cfg)},
3640
3642
{IWL_PCI_DEVICE(0x0082, PCI_ANY_ID, iwl6000_2agn_cfg)},
3641
3643
{IWL_PCI_DEVICE(0x0085, PCI_ANY_ID, iwl6000_3agn_cfg)},
3642
3644
{IWL_PCI_DEVICE(0x0086, PCI_ANY_ID, iwl6050_3agn_cfg)},