wifi: iwlwifi: rename ctx-info-gen3 to ctx-info-v2

Context info was introduced in 22000, and was significantly changed in
ax210. The new version of context info was called 'gen3',
probably because in 22000, the gen2 transport was added.

But this name is just wrong:
- if 'gen' enumerates transports, there was not a gen3 transport, just a
  few modifications to gen1/2 transports needed for ax210.
- if 'gen' enumerates devices, then we can just use the device names.

Also, context info will soon become a lib, agnostic of the transport
generations.
Simply replace 'gen3' with 'v2'.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250511195137.a580bd8d4f74.Ie413a02233f1a5ad538e13071c09760b9d97be3b@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/Makefile b/drivers/net/wireless/intel/iwlwifi/Makefile
index 031babc65a0d5be71bd0e6758a6f12836db18eeb..3f476e3337269f1050c1c1e96c939eca4f32adff 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/Makefile
@@ -8,7 +8,7 @@ iwlwifi-objs            += iwl-nvm-utils.o
 iwlwifi-objs           += iwl-utils.o
 iwlwifi-objs           += iwl-phy-db.o iwl-nvm-parse.o
 iwlwifi-objs           += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
-iwlwifi-objs           += pcie/ctxt-info.o pcie/ctxt-info-gen3.o
+iwlwifi-objs           += pcie/ctxt-info.o pcie/ctxt-info-v2.o
 iwlwifi-objs           += pcie/trans-gen2.o pcie/tx-gen2.o
 
 CFLAGS_pcie/drv.o += -Wno-override-init

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h b/drivers/net/wireless/intel/iwlwifi/iwl-context-info-v2.h
similarity index 91%
rename from drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-context-info-v2.h
index 70295098ae982e688be2517ae891eba21094865b..8c5c0ea46181b0bb89af7f4b4526979170abe754 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-context-info-v2.h
@@ -2,8 +2,8 @@
 /*
  * Copyright (C) 2018, 2020-2025 Intel Corporation
  */
-#ifndef __iwl_context_info_file_gen3_h__
-#define __iwl_context_info_file_gen3_h__
+#ifndef __iwl_context_info_file_v2_h__
+#define __iwl_context_info_file_v2_h__
 
 #include "iwl-context-info.h"
 
@@ -250,7 +250,7 @@ struct iwl_prph_info {
 } __packed; /* PERIPH_INFO_S */
 
 /**
- * struct iwl_context_info_gen3 - device INIT configuration
+ * struct iwl_context_info_v2 - device INIT configuration
  * @version: version of the context information
  * @size: size of context information in DWs
  * @config: context in which the peripheral would execute - a subset of
@@ -293,7 +293,7 @@ struct iwl_prph_info {
  * @prph_scratch_size: the size of the peripheral scratch structure in DWs
  * @reserved: reserved
  */
-struct iwl_context_info_gen3 {
+struct iwl_context_info_v2 {
        __le16 version;
        __le16 size;
        __le32 config;
@@ -323,22 +323,22 @@ struct iwl_context_info_gen3 {
        __le32 reserved;
 } __packed; /* IPC_CONTEXT_INFO_S */
 
-int iwl_pcie_ctxt_info_gen3_alloc(struct iwl_trans *trans,
-                                 const struct iwl_fw *fw,
-                                 const struct fw_img *img);
-void iwl_pcie_ctxt_info_gen3_kick(struct iwl_trans *trans);
-void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans, bool alive);
+int iwl_pcie_ctxt_info_v2_alloc(struct iwl_trans *trans,
+                               const struct iwl_fw *fw,
+                               const struct fw_img *img);
+void iwl_pcie_ctxt_info_v2_kick(struct iwl_trans *trans);
+void iwl_pcie_ctxt_info_v2_free(struct iwl_trans *trans, bool alive);
 
-int iwl_trans_pcie_ctx_info_gen3_load_pnvm(struct iwl_trans *trans,
-                                          const struct iwl_pnvm_image *pnvm_payloads,
-                                          const struct iwl_ucode_capabilities *capa);
-void iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,
-                                          const struct iwl_ucode_capabilities *capa);
+int iwl_trans_pcie_ctx_info_v2_load_pnvm(struct iwl_trans *trans,
+                                        const struct iwl_pnvm_image *pnvm_payloads,
+                                        const struct iwl_ucode_capabilities *capa);
+void iwl_trans_pcie_ctx_info_v2_set_pnvm(struct iwl_trans *trans,
+                                        const struct iwl_ucode_capabilities *capa);
 int
-iwl_trans_pcie_ctx_info_gen3_load_reduce_power(struct iwl_trans *trans,
-                                              const struct iwl_pnvm_image *payloads,
-                                              const struct iwl_ucode_capabilities *capa);
+iwl_trans_pcie_ctx_info_v2_load_reduce_power(struct iwl_trans *trans,
+                                            const struct iwl_pnvm_image *payloads,
+                                            const struct iwl_ucode_capabilities *capa);
 void
-iwl_trans_pcie_ctx_info_gen3_set_reduce_power(struct iwl_trans *trans,
-                                             const struct iwl_ucode_capabilities *capa);
-#endif /* __iwl_context_info_file_gen3_h__ */
+iwl_trans_pcie_ctx_info_v2_set_reduce_power(struct iwl_trans *trans,
+                                           const struct iwl_ucode_capabilities *capa);
+#endif /* __iwl_context_info_file_v2_h__ */

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
index 51bedd09dc69f36ebbddbb7dce0ff8573b5a9f33..59c5ea1727f4c31835041107b3c4caa7dc4513ba 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
@@ -15,7 +15,7 @@
 #include <linux/dmapool.h>
 #include "fw/api/commands.h"
 #include "pcie/internal.h"
-#include "iwl-context-info-gen3.h"
+#include "iwl-context-info-v2.h"
 
 struct iwl_trans_dev_restart_data {
        struct list_head list;
@@ -813,14 +813,14 @@ int iwl_trans_load_pnvm(struct iwl_trans *trans,
                        const struct iwl_pnvm_image *pnvm_data,
                        const struct iwl_ucode_capabilities *capa)
 {
-       return iwl_trans_pcie_ctx_info_gen3_load_pnvm(trans, pnvm_data, capa);
+       return iwl_trans_pcie_ctx_info_v2_load_pnvm(trans, pnvm_data, capa);
 }
 IWL_EXPORT_SYMBOL(iwl_trans_load_pnvm);
 
 void iwl_trans_set_pnvm(struct iwl_trans *trans,
                        const struct iwl_ucode_capabilities *capa)
 {
-       iwl_trans_pcie_ctx_info_gen3_set_pnvm(trans, capa);
+       iwl_trans_pcie_ctx_info_v2_set_pnvm(trans, capa);
 }
 IWL_EXPORT_SYMBOL(iwl_trans_set_pnvm);
 
@@ -828,7 +828,7 @@ int iwl_trans_load_reduce_power(struct iwl_trans *trans,
                                const struct iwl_pnvm_image *payloads,
                                const struct iwl_ucode_capabilities *capa)
 {
-       return iwl_trans_pcie_ctx_info_gen3_load_reduce_power(trans, payloads,
+       return iwl_trans_pcie_ctx_info_v2_load_reduce_power(trans, payloads,
                                                              capa);
 }
 IWL_EXPORT_SYMBOL(iwl_trans_load_reduce_power);
@@ -836,6 +836,6 @@ IWL_EXPORT_SYMBOL(iwl_trans_load_reduce_power);
 void iwl_trans_set_reduce_power(struct iwl_trans *trans,
                                const struct iwl_ucode_capabilities *capa)
 {
-       iwl_trans_pcie_ctx_info_gen3_set_reduce_power(trans, capa);
+       iwl_trans_pcie_ctx_info_v2_set_reduce_power(trans, capa);
 }
 IWL_EXPORT_SYMBOL(iwl_trans_set_reduce_power);

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c
similarity index 89%
rename from drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c
rename to drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c
index 4759e570e807503d4459bbf0f98691dacb984df5..976fd1f58da47b653884aa50fb1aefd886d611f9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c
@@ -5,7 +5,7 @@
 #include <linux/dmi.h>
 #include "iwl-trans.h"
 #include "iwl-fh.h"
-#include "iwl-context-info-gen3.h"
+#include "iwl-context-info-v2.h"
 #include "internal.h"
 #include "iwl-prph.h"
 
@@ -97,12 +97,12 @@ out:
                *control_flags |= IWL_PRPH_SCRATCH_EARLY_DEBUG_EN | dbg_flags;
 }
 
-int iwl_pcie_ctxt_info_gen3_alloc(struct iwl_trans *trans,
-                                 const struct iwl_fw *fw,
-                                 const struct fw_img *img)
+int iwl_pcie_ctxt_info_v2_alloc(struct iwl_trans *trans,
+                               const struct iwl_fw *fw,
+                               const struct fw_img *img)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-       struct iwl_context_info_gen3 *ctxt_info_gen3;
+       struct iwl_context_info_v2 *ctxt_info_v2;
        struct iwl_prph_scratch *prph_scratch;
        struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl;
        struct iwl_prph_info *prph_info;
@@ -213,18 +213,18 @@ int iwl_pcie_ctxt_info_gen3_alloc(struct iwl_trans *trans,
        }
 
        /* Allocate context info */
-       ctxt_info_gen3 = dma_alloc_coherent(trans->dev,
-                                           sizeof(*ctxt_info_gen3),
-                                           &trans_pcie->ctxt_info_dma_addr,
-                                           GFP_KERNEL);
-       if (!ctxt_info_gen3) {
+       ctxt_info_v2 = dma_alloc_coherent(trans->dev,
+                                         sizeof(*ctxt_info_v2),
+                                         &trans_pcie->ctxt_info_dma_addr,
+                                         GFP_KERNEL);
+       if (!ctxt_info_v2) {
                ret = -ENOMEM;
                goto err_free_prph_info;
        }
 
-       ctxt_info_gen3->prph_info_base_addr =
+       ctxt_info_v2->prph_info_base_addr =
                cpu_to_le64(trans_pcie->prph_info_dma_addr);
-       ctxt_info_gen3->prph_scratch_base_addr =
+       ctxt_info_v2->prph_scratch_base_addr =
                cpu_to_le64(trans_pcie->prph_scratch_dma_addr);
 
        /*
@@ -236,29 +236,29 @@ int iwl_pcie_ctxt_info_gen3_alloc(struct iwl_trans *trans,
                     sizeof(prph_scratch->dram.fseq_img) !=
                     sizeof(*prph_scratch));
        if (control_flags_ext & IWL_PRPH_SCRATCH_EXT_EXT_FSEQ)
-               ctxt_info_gen3->prph_scratch_size =
+               ctxt_info_v2->prph_scratch_size =
                        cpu_to_le32(sizeof(*prph_scratch));
        else
-               ctxt_info_gen3->prph_scratch_size =
+               ctxt_info_v2->prph_scratch_size =
                        cpu_to_le32(offsetofend(typeof(*prph_scratch),
                                                dram.common));
 
-       ctxt_info_gen3->cr_head_idx_arr_base_addr =
+       ctxt_info_v2->cr_head_idx_arr_base_addr =
                cpu_to_le64(trans_pcie->rxq->rb_stts_dma);
-       ctxt_info_gen3->tr_tail_idx_arr_base_addr =
+       ctxt_info_v2->tr_tail_idx_arr_base_addr =
                cpu_to_le64(trans_pcie->prph_info_dma_addr + PAGE_SIZE / 2);
-       ctxt_info_gen3->cr_tail_idx_arr_base_addr =
+       ctxt_info_v2->cr_tail_idx_arr_base_addr =
                cpu_to_le64(trans_pcie->prph_info_dma_addr + 3 * PAGE_SIZE / 4);
-       ctxt_info_gen3->mtr_base_addr =
+       ctxt_info_v2->mtr_base_addr =
                cpu_to_le64(trans_pcie->txqs.txq[trans->conf.cmd_queue]->dma_addr);
-       ctxt_info_gen3->mcr_base_addr =
+       ctxt_info_v2->mcr_base_addr =
                cpu_to_le64(trans_pcie->rxq->used_bd_dma);
-       ctxt_info_gen3->mtr_size =
+       ctxt_info_v2->mtr_size =
                cpu_to_le16(TFD_QUEUE_CB_SIZE(cmdq_size));
-       ctxt_info_gen3->mcr_size =
+       ctxt_info_v2->mcr_size =
                cpu_to_le16(RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans)));
 
-       trans_pcie->ctxt_info_gen3 = ctxt_info_gen3;
+       trans_pcie->ctxt_info_v2 = ctxt_info_v2;
        trans_pcie->prph_info = prph_info;
        trans_pcie->prph_scratch = prph_scratch;
 
@@ -277,10 +277,10 @@ int iwl_pcie_ctxt_info_gen3_alloc(struct iwl_trans *trans,
        return 0;
 
 err_free_ctxt_info:
-       dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info_gen3),
-                         trans_pcie->ctxt_info_gen3,
+       dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info_v2),
+                         trans_pcie->ctxt_info_v2,
                          trans_pcie->ctxt_info_dma_addr);
-       trans_pcie->ctxt_info_gen3 = NULL;
+       trans_pcie->ctxt_info_v2 = NULL;
 err_free_prph_info:
        dma_free_coherent(trans->dev, PAGE_SIZE, prph_info,
                          trans_pcie->prph_info_dma_addr);
@@ -294,7 +294,7 @@ err_free_prph_scratch:
 
 }
 
-void iwl_pcie_ctxt_info_gen3_kick(struct iwl_trans *trans)
+void iwl_pcie_ctxt_info_v2_kick(struct iwl_trans *trans)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
@@ -309,7 +309,7 @@ void iwl_pcie_ctxt_info_gen3_kick(struct iwl_trans *trans)
                    CSR_AUTO_FUNC_BOOT_ENA);
 }
 
-void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans, bool alive)
+void iwl_pcie_ctxt_info_v2_free(struct iwl_trans *trans, bool alive)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
@@ -327,15 +327,15 @@ void iwl_pcie_ctxt_info_gen3_free(struct iwl_trans *trans, bool alive)
        if (alive)
                return;
 
-       if (!trans_pcie->ctxt_info_gen3)
+       if (!trans_pcie->ctxt_info_v2)
                return;
 
-       /* ctxt_info_gen3 and prph_scratch are still needed for PNVM load */
-       dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info_gen3),
-                         trans_pcie->ctxt_info_gen3,
+       /* ctxt_info_v2 and prph_scratch are still needed for PNVM load */
+       dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info_v2),
+                         trans_pcie->ctxt_info_v2,
                          trans_pcie->ctxt_info_dma_addr);
        trans_pcie->ctxt_info_dma_addr = 0;
-       trans_pcie->ctxt_info_gen3 = NULL;
+       trans_pcie->ctxt_info_v2 = NULL;
 
        dma_free_coherent(trans->dev, sizeof(*trans_pcie->prph_scratch),
                          trans_pcie->prph_scratch,
@@ -439,9 +439,9 @@ static int iwl_pcie_load_payloads_segments
 
 }
 
-int iwl_trans_pcie_ctx_info_gen3_load_pnvm(struct iwl_trans *trans,
-                                          const struct iwl_pnvm_image *pnvm_payloads,
-                                          const struct iwl_ucode_capabilities *capa)
+int iwl_trans_pcie_ctx_info_v2_load_pnvm(struct iwl_trans *trans,
+                                        const struct iwl_pnvm_image *pnvm_payloads,
+                                        const struct iwl_ucode_capabilities *capa)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =
@@ -521,8 +521,8 @@ static void iwl_pcie_set_contig_pnvm(struct iwl_trans *trans)
                cpu_to_le32(trans_pcie->pnvm_data.drams[0].size);
 }
 
-void iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,
-                                          const struct iwl_ucode_capabilities *capa)
+void iwl_trans_pcie_ctx_info_v2_set_pnvm(struct iwl_trans *trans,
+                                        const struct iwl_ucode_capabilities *capa)
 {
        if (trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210)
                return;
@@ -533,9 +533,9 @@ void iwl_trans_pcie_ctx_info_gen3_set_pnvm(struct iwl_trans *trans,
                iwl_pcie_set_contig_pnvm(trans);
 }
 
-int iwl_trans_pcie_ctx_info_gen3_load_reduce_power(struct iwl_trans *trans,
-                                                  const struct iwl_pnvm_image *payloads,
-                                                  const struct iwl_ucode_capabilities *capa)
+int iwl_trans_pcie_ctx_info_v2_load_reduce_power(struct iwl_trans *trans,
+                                                const struct iwl_pnvm_image *payloads,
+                                                const struct iwl_ucode_capabilities *capa)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        struct iwl_prph_scratch_ctrl_cfg *prph_sc_ctrl =
@@ -604,8 +604,8 @@ static void iwl_pcie_set_contig_reduce_power(struct iwl_trans *trans)
 }
 
 void
-iwl_trans_pcie_ctx_info_gen3_set_reduce_power(struct iwl_trans *trans,
-                                             const struct iwl_ucode_capabilities *capa)
+iwl_trans_pcie_ctx_info_v2_set_reduce_power(struct iwl_trans *trans,
+                                           const struct iwl_ucode_capabilities *capa)
 {
        if (trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210)
                return;

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index a8aeb5c115fd94fa3a623938f8519a60feacdb57..026401c939bbf2df345815c74abedf286947c508 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -326,7 +326,7 @@ struct iwl_pcie_txqs {
  * @global_table: table mapping received VID from hw to rxb
  * @rba: allocator for RX replenishing
  * @ctxt_info: context information for FW self init
- * @ctxt_info_gen3: context information for gen3 devices
+ * @ctxt_info_v2: context information for v1 devices
  * @prph_info: prph info for self init
  * @prph_scratch: prph scratch for self init
  * @ctxt_info_dma_addr: dma addr of context information
@@ -408,7 +408,7 @@ struct iwl_trans_pcie {
        struct iwl_rb_allocator rba;
        union {
                struct iwl_context_info *ctxt_info;
-               struct iwl_context_info_gen3 *ctxt_info_gen3;
+               struct iwl_context_info_v2 *ctxt_info_v2;
        };
        struct iwl_prph_info *prph_info;
        struct iwl_prph_scratch *prph_scratch;

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
index 72ee9ddc1b19655e623f70aae142858a73c92dc6..f0405eddc36793284c3f7f517908aa093093a329 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
@@ -12,7 +12,7 @@
 #include "iwl-io.h"
 #include "internal.h"
 #include "iwl-op-mode.h"
-#include "iwl-context-info-gen3.h"
+#include "iwl-context-info-v2.h"
 #include "fw/dbg.h"
 
 /******************************************************************************

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index d606c586e57c5a00d3ee34f131200b96c69fc1d9..38ad719161e686eee0cc8d4576e5d78b40421f00 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -6,7 +6,7 @@
 #include "iwl-trans.h"
 #include "iwl-prph.h"
 #include "iwl-context-info.h"
-#include "iwl-context-info-gen3.h"
+#include "iwl-context-info-v2.h"
 #include "internal.h"
 #include "fw/dbg.h"
 
@@ -192,7 +192,7 @@ static void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)
 
        iwl_pcie_ctxt_info_free_paging(trans);
        if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_AX210)
-               iwl_pcie_ctxt_info_gen3_free(trans, false);
+               iwl_pcie_ctxt_info_v2_free(trans, false);
        else
                iwl_pcie_ctxt_info_free(trans);
 
@@ -375,7 +375,7 @@ void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans)
         * paging memory cannot be freed included since FW will still use it
         */
        if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_AX210)
-               iwl_pcie_ctxt_info_gen3_free(trans, true);
+               iwl_pcie_ctxt_info_v2_free(trans, true);
        else
                iwl_pcie_ctxt_info_free(trans);
 
@@ -555,12 +555,12 @@ again:
 
        if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_AX210) {
                if (!top_reset_done) {
-                       ret = iwl_pcie_ctxt_info_gen3_alloc(trans, fw, img);
+                       ret = iwl_pcie_ctxt_info_v2_alloc(trans, fw, img);
                        if (ret)
                                goto out;
                }
 
-               iwl_pcie_ctxt_info_gen3_kick(trans);
+               iwl_pcie_ctxt_info_v2_kick(trans);
        } else {
                ret = iwl_pcie_ctxt_info_init(trans, img);
                if (ret)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 906fee5bf47ef8968c6cd21334d0ad4d81eaa731..9462e9ee4ab19b0eb9088df6654bbf0097a12e9e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -28,7 +28,7 @@
 #include "mei/iwl-mei.h"
 #include "internal.h"
 #include "iwl-fh.h"
-#include "iwl-context-info-gen3.h"
+#include "iwl-context-info-v2.h"
 
 /* extended range in FW SRAM */
 #define IWL_FW_MEM_EXTENDED_START      0x40000