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

Commit 47408639 authored by Esti Kummer's avatar Esti Kummer Committed by John W. Linville
Browse files

iwlwifi: adding pci device ids to iwl_hw_card_ids 



The patch adds PCI device IDs to iwl_hw_card_ids.

Signed-off-by: default avatarEsti Kummer <stkumer@localhost.localdomain>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4bd9b4f3

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

+18 −0
Original line number Diff line number Diff line
@@ -1506,6 +1506,24 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.mod_params = &iwl50_mod_params,

};



struct iwl_cfg iwl5100_bg_cfg = {

	.name = "5100BG",

	.fw_name = "iwlwifi-5000" IWL5000_UCODE_API ".ucode",

	.sku = IWL_SKU_G,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.mod_params = &iwl50_mod_params,

};



struct iwl_cfg iwl5100_abg_cfg = {

	.name = "5100ABG",

	.fw_name = "iwlwifi-5000" IWL5000_UCODE_API ".ucode",

	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.mod_params = &iwl50_mod_params,

};



struct iwl_cfg iwl5100_agn_cfg = {

	.name = "5100AGN",

	.fw_name = "iwlwifi-5000" IWL5000_UCODE_API ".ucode",

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

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ extern struct iwl_cfg iwl4965_agn_cfg; 
extern struct iwl_cfg iwl5300_agn_cfg;

extern struct iwl_cfg iwl5100_agn_cfg;

extern struct iwl_cfg iwl5350_agn_cfg;

extern struct iwl_cfg iwl5100_bg_cfg;

extern struct iwl_cfg iwl5100_abg_cfg;



/* Change firmware file name, using "-" and incrementing number,

 *   *only* when uCode interface or architecture changes so that it

drivers/net/wireless/iwlwifi/iwl4965-base.c

+9 −1
Original line number Diff line number Diff line
@@ -4421,8 +4421,16 @@ static struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)},

	{IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)},

#ifdef CONFIG_IWL5000

	{IWL_PCI_DEVICE(0x4235, PCI_ANY_ID, iwl5300_agn_cfg)},

	{IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bg_cfg)},

	{IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bg_cfg)},

	{IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)},

	{IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)},

	{IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)},

	{IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)},

	{IWL_PCI_DEVICE(0x4232, PCI_ANY_ID, iwl5100_agn_cfg)},

	{IWL_PCI_DEVICE(0x4235, PCI_ANY_ID, iwl5300_agn_cfg)},

	{IWL_PCI_DEVICE(0x4236, PCI_ANY_ID, iwl5300_agn_cfg)},

	{IWL_PCI_DEVICE(0x4237, PCI_ANY_ID, iwl5100_agn_cfg)},

	{IWL_PCI_DEVICE(0x423A, PCI_ANY_ID, iwl5350_agn_cfg)},

#endif /* CONFIG_IWL5000 */

	{0}