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

Commit 1144181c authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: fix incorrect PCI subsystem id for 6150 devices 



For 6150 devices, modify the supported PCI subsystem ID.

Cc: stable@kernel.org
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 59342f6a

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

+18 −10
Original line number Diff line number Diff line
@@ -603,19 +603,27 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	IWL_DEVICE_6050,

};



#define IWL_DEVICE_6150						\

	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.ops = &iwl6150_ops,					\

	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\

	.base_params = &iwl6050_base_params,			\

	.need_dc_calib = true,					\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",

	.fw_name_pre = IWL6050_FW_PRE,

	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,

	.ops = &iwl6150_ops,

	.base_params = &iwl6050_base_params,

	IWL_DEVICE_6150,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

	.led_mode = IWL_LED_RF_STATE,

	.internal_wimax_coex = true,

};



struct iwl_cfg iwl6150_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG",

	IWL_DEVICE_6150,

};



struct iwl_cfg iwl6000_3agn_cfg = {

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

+3 −3
Original line number Diff line number Diff line
@@ -3831,11 +3831,11 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 


/* 6150 WiFi/WiMax Series */

	{IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1306, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1326, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)},

	{IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0886, 0x1316, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)},



/* 1000 Series WiFi */

	{IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)},

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

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ extern struct iwl_cfg iwl6000_3agn_cfg; 
extern struct iwl_cfg iwl6050_2agn_cfg;

extern struct iwl_cfg iwl6050_2abg_cfg;

extern struct iwl_cfg iwl6150_bgn_cfg;

extern struct iwl_cfg iwl6150_bg_cfg;

extern struct iwl_cfg iwl1000_bgn_cfg;

extern struct iwl_cfg iwl1000_bg_cfg;

extern struct iwl_cfg iwl100_bgn_cfg;