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

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

iwlwifi: drop non-production PCI-IDs for 6x50 series 



drop the non-production PCI-IDs for 6x50 series

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d7d14401

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

+0 −32
Original line number Original line Diff line number Diff line
@@ -456,37 +456,5 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.support_ct_kill_exit = true,

	.support_ct_kill_exit = true,

};

};





struct iwl_cfg iwl6050_3agn_cfg = {

	.name = "6050 Series 3x3 AGN",

	.fw_name_pre = IWL6050_FW_PRE,

	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl6050_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWL50_NUM_QUEUES,

	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,

	.mod_params = &iwl50_mod_params,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.pa_type = IWL_PA_SYSTEM,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,

	.shadow_ram_support = true,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_ht = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.supports_idle = true,

	.adv_thermal_throttle = true,

	.support_ct_kill_exit = true,

	.support_sm_ps = true,

	.support_wimax_coexist = true,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -3484,13 +3484,10 @@ static struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},

	{IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},





/* 6x50 WiFi/WiMax Series */

/* 6x50 WiFi/WiMax Series */

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

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

	{IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_2abg_cfg)},

	{IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_2abg_cfg)},

	{IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_2abg_cfg)},

	{IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_2abg_cfg)},

	{IWL_PCI_DEVICE(0x0088, 0x1111, iwl6050_3agn_cfg)},

	{IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)},

	{IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)},

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

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

extern struct iwl_cfg iwl6000_3agn_cfg;

extern struct iwl_cfg iwl6050_2agn_cfg;

extern struct iwl_cfg iwl6050_2agn_cfg;

extern struct iwl_cfg iwl6050_2abg_cfg;

extern struct iwl_cfg iwl6050_2abg_cfg;

extern struct iwl_cfg iwl6050_3agn_cfg;

extern struct iwl_cfg iwl1000_bgn_cfg;

extern struct iwl_cfg iwl1000_bgn_cfg;

extern struct iwl_cfg iwl1000_bg_cfg;

extern struct iwl_cfg iwl1000_bg_cfg;