Skip to content

Commit 97b9b84

Browse files
author
Kalle Valo
committed
Merge tag 'iwlwifi-next-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* Support for Link Quality measurement (Aviya) * Improvements in thermal (Chaya Rachel) * Various cleanups (many people) * Improvements in firmware error dump (Golan) * More work 9000 devices and MSIx (Haim) * Continuation of the Dynamic Queue Allocation work (Liad) * Scan timeout to cope with buggy firmware (Luca) * D0i3 improvements (Luca) * Make the paging less memory hungry (Matti) * 9000 new Rx path (Sara)
2 parents 4da46ce + 46167a8 commit 97b9b84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1475
-1907
lines changed

‎drivers/net/wireless/intel/iwlwifi/Kconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,6 @@ config IWLWIFI_BCAST_FILTERING
8888
If unsure, don't enable this option, as some programs might
8989
expect incoming broadcasts for their normal operations.
9090

91-
config IWLWIFI_UAPSD
92-
bool "enable U-APSD by default"
93-
depends on IWLMVM
94-
help
95-
Say Y here to enable U-APSD by default. This may cause
96-
interoperability problems with some APs, manifesting in lower than
97-
expected throughput due to those APs not enabling aggregation
98-
99-
If unsure, say N.
100-
10191
config IWLWIFI_PCIE_RTPM
10292
bool "Enable runtime power management mode for PCIe devices"
10393
depends on IWLMVM && PM

‎drivers/net/wireless/intel/iwlwifi/dvm/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ static void iwl_bg_restart(struct work_struct *data)
10711071

10721072
static void iwl_setup_deferred_work(struct iwl_priv *priv)
10731073
{
1074-
priv->workqueue = create_singlethread_workqueue(DRV_NAME);
1074+
priv->workqueue = alloc_ordered_workqueue(DRV_NAME, 0);
10751075

10761076
INIT_WORK(&priv->restart, iwl_bg_restart);
10771077
INIT_WORK(&priv->beacon_update, iwl_bg_beacon_update);

‎drivers/net/wireless/intel/iwlwifi/iwl-1000.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
#define IWL1000_UCODE_API_MAX 5
3535
#define IWL100_UCODE_API_MAX 5
3636

37-
/* Oldest version we won't warn about */
38-
#define IWL1000_UCODE_API_OK 5
39-
#define IWL100_UCODE_API_OK 5
40-
4137
/* Lowest firmware API version supported */
4238
#define IWL1000_UCODE_API_MIN 1
4339
#define IWL100_UCODE_API_MIN 5
@@ -86,7 +82,6 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = {
8682
#define IWL_DEVICE_1000 \
8783
.fw_name_pre = IWL1000_FW_PRE, \
8884
.ucode_api_max = IWL1000_UCODE_API_MAX, \
89-
.ucode_api_ok = IWL1000_UCODE_API_OK, \
9085
.ucode_api_min = IWL1000_UCODE_API_MIN, \
9186
.device_family = IWL_DEVICE_FAMILY_1000, \
9287
.max_inst_size = IWLAGN_RTC_INST_SIZE, \
@@ -112,7 +107,6 @@ const struct iwl_cfg iwl1000_bg_cfg = {
112107
#define IWL_DEVICE_100 \
113108
.fw_name_pre = IWL100_FW_PRE, \
114109
.ucode_api_max = IWL100_UCODE_API_MAX, \
115-
.ucode_api_ok = IWL100_UCODE_API_OK, \
116110
.ucode_api_min = IWL100_UCODE_API_MIN, \
117111
.device_family = IWL_DEVICE_FAMILY_100, \
118112
.max_inst_size = IWLAGN_RTC_INST_SIZE, \
@@ -136,5 +130,5 @@ const struct iwl_cfg iwl100_bg_cfg = {
136130
IWL_DEVICE_100,
137131
};
138132

139-
MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_OK));
140-
MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_OK));
133+
MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
134+
MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/iwl-2000.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@
3636
#define IWL105_UCODE_API_MAX 6
3737
#define IWL135_UCODE_API_MAX 6
3838

39-
/* Oldest version we won't warn about */
40-
#define IWL2030_UCODE_API_OK 6
41-
#define IWL2000_UCODE_API_OK 6
42-
#define IWL105_UCODE_API_OK 6
43-
#define IWL135_UCODE_API_OK 6
44-
4539
/* Lowest firmware API version supported */
4640
#define IWL2030_UCODE_API_MIN 5
4741
#define IWL2000_UCODE_API_MIN 5
@@ -114,7 +108,6 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = {
114108
#define IWL_DEVICE_2000 \
115109
.fw_name_pre = IWL2000_FW_PRE, \
116110
.ucode_api_max = IWL2000_UCODE_API_MAX, \
117-
.ucode_api_ok = IWL2000_UCODE_API_OK, \
118111
.ucode_api_min = IWL2000_UCODE_API_MIN, \
119112
.device_family = IWL_DEVICE_FAMILY_2000, \
120113
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -142,7 +135,6 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {
142135
#define IWL_DEVICE_2030 \
143136
.fw_name_pre = IWL2030_FW_PRE, \
144137
.ucode_api_max = IWL2030_UCODE_API_MAX, \
145-
.ucode_api_ok = IWL2030_UCODE_API_OK, \
146138
.ucode_api_min = IWL2030_UCODE_API_MIN, \
147139
.device_family = IWL_DEVICE_FAMILY_2030, \
148140
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -163,7 +155,6 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {
163155
#define IWL_DEVICE_105 \
164156
.fw_name_pre = IWL105_FW_PRE, \
165157
.ucode_api_max = IWL105_UCODE_API_MAX, \
166-
.ucode_api_ok = IWL105_UCODE_API_OK, \
167158
.ucode_api_min = IWL105_UCODE_API_MIN, \
168159
.device_family = IWL_DEVICE_FAMILY_105, \
169160
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -191,7 +182,6 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {
191182
#define IWL_DEVICE_135 \
192183
.fw_name_pre = IWL135_FW_PRE, \
193184
.ucode_api_max = IWL135_UCODE_API_MAX, \
194-
.ucode_api_ok = IWL135_UCODE_API_OK, \
195185
.ucode_api_min = IWL135_UCODE_API_MIN, \
196186
.device_family = IWL_DEVICE_FAMILY_135, \
197187
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -210,7 +200,7 @@ const struct iwl_cfg iwl135_bgn_cfg = {
210200
.ht_params = &iwl2000_ht_params,
211201
};
212202

213-
MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_OK));
214-
MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_OK));
215-
MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_OK));
216-
MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_OK));
203+
MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));
204+
MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));
205+
MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));
206+
MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_MAX));

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
#define IWL5000_UCODE_API_MAX 5
3535
#define IWL5150_UCODE_API_MAX 2
3636

37-
/* Oldest version we won't warn about */
38-
#define IWL5000_UCODE_API_OK 5
39-
#define IWL5150_UCODE_API_OK 2
40-
4137
/* Lowest firmware API version supported */
4238
#define IWL5000_UCODE_API_MIN 1
4339
#define IWL5150_UCODE_API_MIN 1
@@ -84,7 +80,6 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = {
8480
#define IWL_DEVICE_5000 \
8581
.fw_name_pre = IWL5000_FW_PRE, \
8682
.ucode_api_max = IWL5000_UCODE_API_MAX, \
87-
.ucode_api_ok = IWL5000_UCODE_API_OK, \
8883
.ucode_api_min = IWL5000_UCODE_API_MIN, \
8984
.device_family = IWL_DEVICE_FAMILY_5000, \
9085
.max_inst_size = IWLAGN_RTC_INST_SIZE, \
@@ -132,7 +127,6 @@ const struct iwl_cfg iwl5350_agn_cfg = {
132127
.name = "Intel(R) WiMAX/WiFi Link 5350 AGN",
133128
.fw_name_pre = IWL5000_FW_PRE,
134129
.ucode_api_max = IWL5000_UCODE_API_MAX,
135-
.ucode_api_ok = IWL5000_UCODE_API_OK,
136130
.ucode_api_min = IWL5000_UCODE_API_MIN,
137131
.device_family = IWL_DEVICE_FAMILY_5000,
138132
.max_inst_size = IWLAGN_RTC_INST_SIZE,
@@ -149,7 +143,6 @@ const struct iwl_cfg iwl5350_agn_cfg = {
149143
#define IWL_DEVICE_5150 \
150144
.fw_name_pre = IWL5150_FW_PRE, \
151145
.ucode_api_max = IWL5150_UCODE_API_MAX, \
152-
.ucode_api_ok = IWL5150_UCODE_API_OK, \
153146
.ucode_api_min = IWL5150_UCODE_API_MIN, \
154147
.device_family = IWL_DEVICE_FAMILY_5150, \
155148
.max_inst_size = IWLAGN_RTC_INST_SIZE, \
@@ -174,5 +167,5 @@ const struct iwl_cfg iwl5150_abg_cfg = {
174167
IWL_DEVICE_5150,
175168
};
176169

177-
MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_OK));
178-
MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_OK));
170+
MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));
171+
MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@
3636
#define IWL6000G2_UCODE_API_MAX 6
3737
#define IWL6035_UCODE_API_MAX 6
3838

39-
/* Oldest version we won't warn about */
40-
#define IWL6000_UCODE_API_OK 4
41-
#define IWL6000G2_UCODE_API_OK 5
42-
#define IWL6050_UCODE_API_OK 5
43-
#define IWL6000G2B_UCODE_API_OK 6
44-
#define IWL6035_UCODE_API_OK 6
45-
4639
/* Lowest firmware API version supported */
4740
#define IWL6000_UCODE_API_MIN 4
4841
#define IWL6050_UCODE_API_MIN 4
@@ -136,7 +129,6 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = {
136129
#define IWL_DEVICE_6005 \
137130
.fw_name_pre = IWL6005_FW_PRE, \
138131
.ucode_api_max = IWL6000G2_UCODE_API_MAX, \
139-
.ucode_api_ok = IWL6000G2_UCODE_API_OK, \
140132
.ucode_api_min = IWL6000G2_UCODE_API_MIN, \
141133
.device_family = IWL_DEVICE_FAMILY_6005, \
142134
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -191,7 +183,6 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = {
191183
#define IWL_DEVICE_6030 \
192184
.fw_name_pre = IWL6030_FW_PRE, \
193185
.ucode_api_max = IWL6000G2_UCODE_API_MAX, \
194-
.ucode_api_ok = IWL6000G2B_UCODE_API_OK, \
195186
.ucode_api_min = IWL6000G2_UCODE_API_MIN, \
196187
.device_family = IWL_DEVICE_FAMILY_6030, \
197188
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -228,7 +219,6 @@ const struct iwl_cfg iwl6030_2bg_cfg = {
228219
#define IWL_DEVICE_6035 \
229220
.fw_name_pre = IWL6030_FW_PRE, \
230221
.ucode_api_max = IWL6035_UCODE_API_MAX, \
231-
.ucode_api_ok = IWL6035_UCODE_API_OK, \
232222
.ucode_api_min = IWL6035_UCODE_API_MIN, \
233223
.device_family = IWL_DEVICE_FAMILY_6030, \
234224
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -282,7 +272,6 @@ const struct iwl_cfg iwl130_bg_cfg = {
282272
#define IWL_DEVICE_6000i \
283273
.fw_name_pre = IWL6000_FW_PRE, \
284274
.ucode_api_max = IWL6000_UCODE_API_MAX, \
285-
.ucode_api_ok = IWL6000_UCODE_API_OK, \
286275
.ucode_api_min = IWL6000_UCODE_API_MIN, \
287276
.device_family = IWL_DEVICE_FAMILY_6000i, \
288277
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -370,7 +359,6 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
370359
.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",
371360
.fw_name_pre = IWL6000_FW_PRE,
372361
.ucode_api_max = IWL6000_UCODE_API_MAX,
373-
.ucode_api_ok = IWL6000_UCODE_API_OK,
374362
.ucode_api_min = IWL6000_UCODE_API_MIN,
375363
.device_family = IWL_DEVICE_FAMILY_6000,
376364
.max_inst_size = IWL60_RTC_INST_SIZE,
@@ -383,7 +371,7 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
383371
.led_mode = IWL_LED_BLINK,
384372
};
385373

386-
MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK));
387-
MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_OK));
388-
MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_OK));
389-
MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_OK));
374+
MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
375+
MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
376+
MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
377+
MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/iwl-7000.c

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,10 @@
7676
#define IWL7265D_UCODE_API_MAX 21
7777
#define IWL3168_UCODE_API_MAX 21
7878

79-
/* Oldest version we won't warn about */
80-
#define IWL7260_UCODE_API_OK 13
81-
#define IWL7265_UCODE_API_OK 13
82-
#define IWL7265D_UCODE_API_OK 13
83-
#define IWL3168_UCODE_API_OK 20
84-
8579
/* Lowest firmware API version supported */
86-
#define IWL7260_UCODE_API_MIN 13
87-
#define IWL7265_UCODE_API_MIN 13
88-
#define IWL7265D_UCODE_API_MIN 13
80+
#define IWL7260_UCODE_API_MIN 16
81+
#define IWL7265_UCODE_API_MIN 16
82+
#define IWL7265D_UCODE_API_MIN 16
8983
#define IWL3168_UCODE_API_MIN 20
9084

9185
/* NVM versions */
@@ -179,25 +173,21 @@ static const struct iwl_ht_params iwl7000_ht_params = {
179173
#define IWL_DEVICE_7000 \
180174
IWL_DEVICE_7000_COMMON, \
181175
.ucode_api_max = IWL7260_UCODE_API_MAX, \
182-
.ucode_api_ok = IWL7260_UCODE_API_OK, \
183176
.ucode_api_min = IWL7260_UCODE_API_MIN
184177

185178
#define IWL_DEVICE_7005 \
186179
IWL_DEVICE_7000_COMMON, \
187180
.ucode_api_max = IWL7265_UCODE_API_MAX, \
188-
.ucode_api_ok = IWL7265_UCODE_API_OK, \
189181
.ucode_api_min = IWL7265_UCODE_API_MIN
190182

191183
#define IWL_DEVICE_3008 \
192184
IWL_DEVICE_7000_COMMON, \
193185
.ucode_api_max = IWL3168_UCODE_API_MAX, \
194-
.ucode_api_ok = IWL3168_UCODE_API_OK, \
195186
.ucode_api_min = IWL3168_UCODE_API_MIN
196187

197188
#define IWL_DEVICE_7005D \
198189
IWL_DEVICE_7000_COMMON, \
199190
.ucode_api_max = IWL7265D_UCODE_API_MAX, \
200-
.ucode_api_ok = IWL7265D_UCODE_API_OK, \
201191
.ucode_api_min = IWL7265D_UCODE_API_MIN
202192

203193
const struct iwl_cfg iwl7260_2ac_cfg = {
@@ -388,8 +378,8 @@ const struct iwl_cfg iwl7265d_n_cfg = {
388378
.dccm_len = IWL7265_DCCM_LEN,
389379
};
390380

391-
MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
392-
MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
393-
MODULE_FIRMWARE(IWL3168_MODULE_FIRMWARE(IWL3168_UCODE_API_OK));
394-
MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7265_UCODE_API_OK));
395-
MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7265D_UCODE_API_OK));
381+
MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_MAX));
382+
MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_MAX));
383+
MODULE_FIRMWARE(IWL3168_MODULE_FIRMWARE(IWL3168_UCODE_API_MAX));
384+
MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7265_UCODE_API_MAX));
385+
MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7265D_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/iwl-8000.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,8 @@
7373
#define IWL8000_UCODE_API_MAX 21
7474
#define IWL8265_UCODE_API_MAX 21
7575

76-
/* Oldest version we won't warn about */
77-
#define IWL8000_UCODE_API_OK 13
78-
#define IWL8265_UCODE_API_OK 20
79-
8076
/* Lowest firmware API version supported */
81-
#define IWL8000_UCODE_API_MIN 13
77+
#define IWL8000_UCODE_API_MIN 16
8278
#define IWL8265_UCODE_API_MIN 20
8379

8480
/* NVM versions */
@@ -175,19 +171,16 @@ static const struct iwl_tt_params iwl8000_tt_params = {
175171
#define IWL_DEVICE_8000 \
176172
IWL_DEVICE_8000_COMMON, \
177173
.ucode_api_max = IWL8000_UCODE_API_MAX, \
178-
.ucode_api_ok = IWL8000_UCODE_API_OK, \
179174
.ucode_api_min = IWL8000_UCODE_API_MIN \
180175

181176
#define IWL_DEVICE_8260 \
182177
IWL_DEVICE_8000_COMMON, \
183178
.ucode_api_max = IWL8000_UCODE_API_MAX, \
184-
.ucode_api_ok = IWL8000_UCODE_API_OK, \
185179
.ucode_api_min = IWL8000_UCODE_API_MIN \
186180

187181
#define IWL_DEVICE_8265 \
188182
IWL_DEVICE_8000_COMMON, \
189183
.ucode_api_max = IWL8265_UCODE_API_MAX, \
190-
.ucode_api_ok = IWL8265_UCODE_API_OK, \
191184
.ucode_api_min = IWL8265_UCODE_API_MIN \
192185

193186
const struct iwl_cfg iwl8260_2n_cfg = {
@@ -259,5 +252,5 @@ const struct iwl_cfg iwl4165_2ac_sdio_cfg = {
259252
.max_vht_ampdu_exponent = MAX_VHT_AMPDU_EXPONENT_8260_SDIO,
260253
};
261254

262-
MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_OK));
263-
MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_OK));
255+
MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_MAX));
256+
MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_MAX));

‎drivers/net/wireless/intel/iwlwifi/iwl-9000.c

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* GPL LICENSE SUMMARY
77
*
8-
* Copyright(c) 2015 Intel Deutschland GmbH
8+
* Copyright(c) 2015-2016 Intel Deutschland GmbH
99
*
1010
* This program is free software; you can redistribute it and/or modify
1111
* it under the terms of version 2 of the GNU General Public License as
@@ -18,7 +18,7 @@
1818
*
1919
* BSD LICENSE
2020
*
21-
* Copyright(c) 2015 Intel Deutschland GmbH
21+
* Copyright(c) 2015-2016 Intel Deutschland GmbH
2222
* All rights reserved.
2323
*
2424
* Redistribution and use in source and binary forms, with or without
@@ -57,11 +57,8 @@
5757
/* Highest firmware API version supported */
5858
#define IWL9000_UCODE_API_MAX 21
5959

60-
/* Oldest version we won't warn about */
61-
#define IWL9000_UCODE_API_OK 13
62-
6360
/* Lowest firmware API version supported */
64-
#define IWL9000_UCODE_API_MIN 13
61+
#define IWL9000_UCODE_API_MIN 16
6562

6663
/* NVM versions */
6764
#define IWL9000_NVM_VERSION 0x0a1d
@@ -122,7 +119,6 @@ static const struct iwl_tt_params iwl9000_tt_params = {
122119

123120
#define IWL_DEVICE_9000 \
124121
.ucode_api_max = IWL9000_UCODE_API_MAX, \
125-
.ucode_api_ok = IWL9000_UCODE_API_OK, \
126122
.ucode_api_min = IWL9000_UCODE_API_MIN, \
127123
.device_family = IWL_DEVICE_FAMILY_8000, \
128124
.max_inst_size = IWL60_RTC_INST_SIZE, \
@@ -137,14 +133,15 @@ static const struct iwl_tt_params iwl9000_tt_params = {
137133
.dccm2_len = IWL9000_DCCM2_LEN, \
138134
.smem_offset = IWL9000_SMEM_OFFSET, \
139135
.smem_len = IWL9000_SMEM_LEN, \
136+
.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, \
140137
.thermal_params = &iwl9000_tt_params, \
141138
.apmg_not_supported = true, \
142139
.mq_rx_supported = true, \
143140
.vht_mu_mimo_supported = true, \
144141
.mac_addr_from_csr = true
145142

146-
const struct iwl_cfg iwl9260_2ac_cfg = {
147-
.name = "Intel(R) Dual Band Wireless AC 9260",
143+
const struct iwl_cfg iwl9560_2ac_cfg = {
144+
.name = "Intel(R) Dual Band Wireless AC 9560",
148145
.fw_name_pre = IWL9000_FW_PRE,
149146
IWL_DEVICE_9000,
150147
.ht_params = &iwl9000_ht_params,
@@ -163,4 +160,4 @@ const struct iwl_cfg iwl5165_2ac_cfg = {
163160
.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
164161
};
165162

166-
MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_OK));
163+
MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

0 commit comments

Comments
 (0)