Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / wireless / intel / iwlwifi / iwl-8000.c

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index 6c6725e..d02ca14 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -70,11 +70,11 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL8000_UCODE_API_MAX  24
-#define IWL8265_UCODE_API_MAX  24
+#define IWL8000_UCODE_API_MAX  26
+#define IWL8265_UCODE_API_MAX  26
 
 /* Lowest firmware API version supported */
-#define IWL8000_UCODE_API_MIN  16
+#define IWL8000_UCODE_API_MIN  17
 #define IWL8265_UCODE_API_MIN  20
 
 /* NVM versions */
@@ -212,6 +212,17 @@ const struct iwl_cfg iwl8265_2ac_cfg = {
        .vht_mu_mimo_supported = true,
 };
 
+const struct iwl_cfg iwl8275_2ac_cfg = {
+       .name = "Intel(R) Dual Band Wireless AC 8275",
+       .fw_name_pre = IWL8265_FW_PRE,
+       IWL_DEVICE_8265,
+       .ht_params = &iwl8000_ht_params,
+       .nvm_ver = IWL8000_NVM_VERSION,
+       .nvm_calib_ver = IWL8000_TX_POWER_VERSION,
+       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
+       .vht_mu_mimo_supported = true,
+};
+
 const struct iwl_cfg iwl4165_2ac_cfg = {
        .name = "Intel(R) Dual Band Wireless AC 4165",
        .fw_name_pre = IWL8000_FW_PRE,