diff --git a/repos/dde_linux/patches/wifi.patch b/repos/dde_linux/patches/wifi.patch index c8b2a1f5c3..69848401a6 100644 --- a/repos/dde_linux/patches/wifi.patch +++ b/repos/dde_linux/patches/wifi.patch @@ -1,19 +1,3 @@ - drivers/net/wireless/iwlwifi/dvm/rs.c | 2 - drivers/net/wireless/iwlwifi/iwl-debug.c | 18 + - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 - drivers/net/wireless/iwlwifi/mvm/mvm.h | 2 - drivers/net/wireless/iwlwifi/mvm/ops.c | 10 - drivers/net/wireless/iwlwifi/pcie/drv.c | 628 ++++++++++++++------------- - include/linux/ieee80211.h | 2 - include/net/cfg80211.h | 5 - include/net/netlink.h | 8 - include/net/sock.h | 4 - net/core/sock.c | 2 - net/packet/af_packet.c | 6 - net/wireless/core.h | 2 - net/wireless/sysfs.c | 2 - 14 files changed, 359 insertions(+), 334 deletions(-) - diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c index 0977d93..3ccfd0e 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rs.c @@ -126,648 +110,6 @@ index 529d991..5b4c766 100644 memset(&mvm->rx_stats, 0, sizeof(struct mvm_statistics_rx)); return op_mode; -diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c -index 3872ead..357ee20 100644 ---- a/drivers/net/wireless/iwlwifi/pcie/drv.c -+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -78,318 +78,328 @@ - - /* Hardware specific file defines the PCI IDs table for that hardware module */ - static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { --#if IS_ENABLED(CONFIG_IWLDVM) -- {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1204, iwl5100_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1304, iwl5100_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bgn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bgn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1221, iwl5100_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1321, iwl5100_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1224, iwl5100_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1324, iwl5100_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1225, iwl5100_bgn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1325, iwl5100_bgn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1226, iwl5100_abg_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1211, iwl5100_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1311, iwl5100_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1214, iwl5100_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1314, iwl5100_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1215, iwl5100_bgn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1315, iwl5100_bgn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4237, 0x1316, iwl5100_abg_cfg)}, /* Half Mini Card */ -- --/* 5300 Series WiFi */ -- {IWL_PCI_DEVICE(0x4235, 0x1021, iwl5300_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4235, 0x1121, iwl5300_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4235, 0x1024, iwl5300_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4235, 0x1124, iwl5300_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4235, 0x1001, iwl5300_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4235, 0x1101, iwl5300_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4235, 0x1004, iwl5300_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4235, 0x1104, iwl5300_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4236, 0x1011, iwl5300_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4236, 0x1111, iwl5300_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x4236, 0x1014, iwl5300_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x4236, 0x1114, iwl5300_agn_cfg)}, /* Half Mini Card */ -- --/* 5350 Series WiFi/WiMax */ -- {IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)}, /* Mini Card */ -- --/* 5150 Series Wifi/WiMax */ -- {IWL_PCI_DEVICE(0x423C, 0x1201, iwl5150_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x423C, 0x1301, iwl5150_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x423C, 0x1206, iwl5150_abg_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x423C, 0x1326, iwl5150_abg_cfg)}, /* Half Mini Card */ -- -- {IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */ -- {IWL_PCI_DEVICE(0x423D, 0x1216, iwl5150_abg_cfg)}, /* Mini Card */ -- {IWL_PCI_DEVICE(0x423D, 0x1316, iwl5150_abg_cfg)}, /* Half Mini Card */ -- --/* 6x00 Series */ -- {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)}, -- {IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_3agn_cfg)}, -- {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)}, -- {IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_3agn_cfg)}, -- {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)}, -- {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)}, -- {IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_3agn_cfg)}, -+ {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)}, /* x201 */ -+ {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, /* x220 */ -+ {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)}, /* plumbum */ - {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)}, - {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)}, -- --/* 6x05 Series */ -- {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, -- {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)}, -- {IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_2agn_sff_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)}, -- {IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */ -- {IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */ -- --/* 6x30 Series */ -- {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x008A, 0x5307, iwl1030_bg_cfg)}, -- {IWL_PCI_DEVICE(0x008A, 0x5325, iwl1030_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x008A, 0x5327, iwl1030_bg_cfg)}, -- {IWL_PCI_DEVICE(0x008B, 0x5315, iwl1030_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x008B, 0x5317, iwl1030_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0090, 0x5211, iwl6030_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0090, 0x5215, iwl6030_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0090, 0x5216, iwl6030_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x0091, 0x5201, iwl6030_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0091, 0x5205, iwl6030_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0091, 0x5206, iwl6030_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x0091, 0x5207, iwl6030_2bg_cfg)}, -- {IWL_PCI_DEVICE(0x0091, 0x5221, iwl6030_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0091, 0x5225, iwl6030_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0091, 0x5226, iwl6030_2abg_cfg)}, -- --/* 6x50 WiFi/WiMax Series */ -- {IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_2abg_cfg)}, -- {IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)}, -- --/* 6150 WiFi/WiMax Series */ -- {IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)}, -- --/* 1000 Series WiFi */ -- {IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0083, 0x1305, iwl1000_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0083, 0x1225, iwl1000_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0083, 0x1325, iwl1000_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0084, 0x1215, iwl1000_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0084, 0x1315, iwl1000_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0083, 0x1206, iwl1000_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0083, 0x1306, iwl1000_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0083, 0x1226, iwl1000_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)}, -- --/* 100 Series WiFi */ -- {IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)}, -- {IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x08AF, 0x1017, iwl100_bg_cfg)}, -- {IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x08AE, 0x1027, iwl100_bg_cfg)}, -- --/* 130 Series WiFi */ -- {IWL_PCI_DEVICE(0x0896, 0x5005, iwl130_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0896, 0x5007, iwl130_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0897, 0x5015, iwl130_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0897, 0x5017, iwl130_bg_cfg)}, -- {IWL_PCI_DEVICE(0x0896, 0x5025, iwl130_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0896, 0x5027, iwl130_bg_cfg)}, -- --/* 2x00 Series */ -- {IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0891, 0x4222, iwl2000_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0890, 0x4422, iwl2000_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0890, 0x4822, iwl2000_2bgn_d_cfg)}, -- --/* 2x30 Series */ -- {IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0888, 0x4262, iwl2030_2bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0887, 0x4462, iwl2030_2bgn_cfg)}, -- --/* 6x35 Series */ -- {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x088E, 0x406A, iwl6035_2agn_sff_cfg)}, -- {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x088F, 0x426A, iwl6035_2agn_sff_cfg)}, -- {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x088E, 0x446A, iwl6035_2agn_sff_cfg)}, -- {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)}, -- {IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)}, -- --/* 105 Series */ -- {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0894, 0x0822, iwl105_bgn_d_cfg)}, -- --/* 135 Series */ -- {IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)}, -- {IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)}, --#endif /* CONFIG_IWLDVM */ -- --#if IS_ENABLED(CONFIG_IWLMVM) --/* 7260 Series */ - {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg_high_temp)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg_high_temp)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg_high_temp)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x5072, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x5170, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x5770, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7260_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)}, -- --/* 3160 Series */ -- {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x0072, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x0172, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B4, 0x0272, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x0472, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B4, 0x0370, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8072, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8172, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)}, -- {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x1070, iwl3160_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x08B3, 0x1170, iwl3160_2ac_cfg)}, -- --/* 7265 Series */ -- {IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5100, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_n_cfg)}, -- {IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5412, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2n_cfg)}, -- {IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)}, -- {IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9012, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9112, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9310, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)}, -- {IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)}, --#endif /* CONFIG_IWLMVM */ -+ {IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)}, /* x250 */ -+ -+//#if IS_ENABLED(CONFIG_IWLDVM) -+// {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1204, iwl5100_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1304, iwl5100_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bgn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bgn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1221, iwl5100_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1321, iwl5100_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1224, iwl5100_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1324, iwl5100_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1225, iwl5100_bgn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1325, iwl5100_bgn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1226, iwl5100_abg_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1211, iwl5100_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1311, iwl5100_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1214, iwl5100_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1314, iwl5100_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1215, iwl5100_bgn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1315, iwl5100_bgn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4237, 0x1316, iwl5100_abg_cfg)}, /* Half Mini Card */ -+// -+///* 5300 Series WiFi */ -+// {IWL_PCI_DEVICE(0x4235, 0x1021, iwl5300_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4235, 0x1121, iwl5300_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4235, 0x1024, iwl5300_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4235, 0x1124, iwl5300_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4235, 0x1001, iwl5300_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4235, 0x1101, iwl5300_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4235, 0x1004, iwl5300_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4235, 0x1104, iwl5300_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4236, 0x1011, iwl5300_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4236, 0x1111, iwl5300_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x4236, 0x1014, iwl5300_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x4236, 0x1114, iwl5300_agn_cfg)}, /* Half Mini Card */ -+// -+///* 5350 Series WiFi/WiMax */ -+// {IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)}, /* Mini Card */ -+// -+///* 5150 Series Wifi/WiMax */ -+// {IWL_PCI_DEVICE(0x423C, 0x1201, iwl5150_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x423C, 0x1301, iwl5150_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x423C, 0x1206, iwl5150_abg_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x423C, 0x1326, iwl5150_abg_cfg)}, /* Half Mini Card */ -+// -+// {IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */ -+// {IWL_PCI_DEVICE(0x423D, 0x1216, iwl5150_abg_cfg)}, /* Mini Card */ -+// {IWL_PCI_DEVICE(0x423D, 0x1316, iwl5150_abg_cfg)}, /* Half Mini Card */ -+// -+///* 6x00 Series */ -+// {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)}, -+// {IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_3agn_cfg)}, -+// {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)}, -+// {IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_3agn_cfg)}, -+// {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)}, -+// {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)}, -+// {IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_3agn_cfg)}, -+// {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)}, -+// -+///* 6x05 Series */ -+// {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, -+// {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)}, -+// {IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_2agn_sff_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)}, -+// {IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */ -+// {IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */ -+// -+///* 6x30 Series */ -+// {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x008A, 0x5307, iwl1030_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x008A, 0x5325, iwl1030_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x008A, 0x5327, iwl1030_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x008B, 0x5315, iwl1030_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x008B, 0x5317, iwl1030_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0090, 0x5211, iwl6030_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0090, 0x5215, iwl6030_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0090, 0x5216, iwl6030_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x0091, 0x5201, iwl6030_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0091, 0x5205, iwl6030_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0091, 0x5206, iwl6030_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x0091, 0x5207, iwl6030_2bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0091, 0x5221, iwl6030_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0091, 0x5225, iwl6030_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0091, 0x5226, iwl6030_2abg_cfg)}, -+// -+///* 6x50 WiFi/WiMax Series */ -+// {IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_2abg_cfg)}, -+// {IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)}, -+// -+///* 6150 WiFi/WiMax Series */ -+// {IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)}, -+// -+///* 1000 Series WiFi */ -+// {IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0083, 0x1305, iwl1000_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0083, 0x1225, iwl1000_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0083, 0x1325, iwl1000_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0084, 0x1215, iwl1000_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0084, 0x1315, iwl1000_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0083, 0x1206, iwl1000_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0083, 0x1306, iwl1000_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0083, 0x1226, iwl1000_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)}, -+// -+///* 100 Series WiFi */ -+// {IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x08AF, 0x1017, iwl100_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x08AE, 0x1027, iwl100_bg_cfg)}, -+// -+///* 130 Series WiFi */ -+// {IWL_PCI_DEVICE(0x0896, 0x5005, iwl130_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0896, 0x5007, iwl130_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0897, 0x5015, iwl130_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0897, 0x5017, iwl130_bg_cfg)}, -+// {IWL_PCI_DEVICE(0x0896, 0x5025, iwl130_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0896, 0x5027, iwl130_bg_cfg)}, -+// -+///* 2x00 Series */ -+// {IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0891, 0x4222, iwl2000_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0890, 0x4422, iwl2000_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0890, 0x4822, iwl2000_2bgn_d_cfg)}, -+// -+///* 2x30 Series */ -+// {IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0888, 0x4262, iwl2030_2bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0887, 0x4462, iwl2030_2bgn_cfg)}, -+// -+///* 6x35 Series */ -+// {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x088E, 0x406A, iwl6035_2agn_sff_cfg)}, -+// {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x088F, 0x426A, iwl6035_2agn_sff_cfg)}, -+// {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x088E, 0x446A, iwl6035_2agn_sff_cfg)}, -+// {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)}, -+// {IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)}, -+// -+///* 105 Series */ -+// {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0894, 0x0822, iwl105_bgn_d_cfg)}, -+// -+///* 135 Series */ -+// {IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)}, -+// {IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)}, -+//#endif /* CONFIG_IWLDVM */ -+// -+//#if IS_ENABLED(CONFIG_IWLMVM) -+///* 7260 Series */ -+// {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)}, -+ -+// {IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)}, -+ -+// {IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg_high_temp)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg_high_temp)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg_high_temp)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x5072, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x5170, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x5770, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7260_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)}, -+ -+///* 3160 Series */ -+// {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x0072, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x0172, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B4, 0x0272, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x0472, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B4, 0x0370, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8072, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8172, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)}, -+// {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x1070, iwl3160_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x08B3, 0x1170, iwl3160_2ac_cfg)}, -+// -+///* 7265 Series */ -+// {IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5100, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_n_cfg)}, -+// {IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5412, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5000, iwl7265_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x500A, iwl7265_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x095B, 0x5200, iwl7265_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5002, iwl7265_n_cfg)}, -+// {IWL_PCI_DEVICE(0x095B, 0x5202, iwl7265_n_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9010, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9012, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9110, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9112, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9210, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9510, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9310, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x9410, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5020, iwl7265_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x502A, iwl7265_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5420, iwl7265_2n_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5090, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5190, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)}, -+// {IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)}, -+//#endif /* CONFIG_IWLMVM */ - - {0} - }; diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index e526a8c..f3134fe 100644 --- a/include/linux/ieee80211.h diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index f2fe6b779e..d5ac0c7df9 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -99f2a9a5c5f6890c3dcae3ae1f26913f2e055138 +630e489f7f95892f1f70144ab363024e01dd7851