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

Commit 542cc793 authored by Jay Sternberg's avatar Jay Sternberg Committed by John W. Linville
Browse files

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: default avatarJay Sternberg <jay.e.sternberg@linux.intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 209d889b

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

+4 −4
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ struct iwl_cfg iwl6000_2agn_cfg = { 
	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.need_pll_cfg = false,

};
@@ -117,8 +117,8 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_BC,

	.valid_rx_ant = ANT_BC,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.need_pll_cfg = false,

};

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

+2 −0
Original line number Diff line number Diff line
@@ -3636,7 +3636,9 @@ static struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x0085, 0x1112, iwl6000_2ag_cfg)},

	{IWL_PCI_DEVICE(0x0082, 0x1122, iwl6000_2ag_cfg)},

	{IWL_PCI_DEVICE(0x422B, PCI_ANY_ID, iwl6000_3agn_cfg)},

	{IWL_PCI_DEVICE(0x422C, PCI_ANY_ID, iwl6000_2agn_cfg)},

	{IWL_PCI_DEVICE(0x4238, PCI_ANY_ID, iwl6000_3agn_cfg)},

	{IWL_PCI_DEVICE(0x4239, PCI_ANY_ID, iwl6000_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0082, PCI_ANY_ID, iwl6000_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0085, PCI_ANY_ID, iwl6000_3agn_cfg)},

	{IWL_PCI_DEVICE(0x0086, PCI_ANY_ID, iwl6050_3agn_cfg)},