Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/970166/?format=api
{ "id": 970166, "url": "http://patchwork.ozlabs.org/api/patches/970166/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180915003757.169108-10-jesse.brandeburg@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180915003757.169108-10-jesse.brandeburg@intel.com>", "list_archive_url": null, "date": "2018-09-15T00:37:52", "name": "[net-next,v2,09/14] iavf: rename i40e_hw to iavf_hw", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "59b3431d44da1bbb6a8eae25d55c2175f2bf15dd", "submitter": { "id": 189, "url": "http://patchwork.ozlabs.org/api/people/189/?format=api", "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180915003757.169108-10-jesse.brandeburg@intel.com/mbox/", "series": [ { "id": 65816, "url": "http://patchwork.ozlabs.org/api/series/65816/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=65816", "date": "2018-09-15T00:37:43", "name": "[net-next,v2,01/14] intel-ethernet: rename i40evf to iavf", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/65816/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/970166/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/970166/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 42Btlj2llgz9sBJ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 15 Sep 2018 10:38:09 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 8737788D93;\n\tSat, 15 Sep 2018 00:38:07 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 0+HD2nVpv0ZA; Sat, 15 Sep 2018 00:38:04 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 12B8E88DB0;\n\tSat, 15 Sep 2018 00:38:04 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9C6DF1C2E93\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:38:01 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9A0828783E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:38:01 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id UW7LVcWcrcp7 for <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:37:59 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id C67A8877AA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:37:59 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Sep 2018 17:37:59 -0700", "from jfsjbrandeb002.jf.intel.com ([10.166.241.63])\n\tby fmsmga001.fm.intel.com with ESMTP; 14 Sep 2018 17:37:59 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,375,1531810800\"; d=\"scan'208\";a=\"90189568\"", "From": "Jesse Brandeburg <jesse.brandeburg@intel.com>", "To": "netdev@vger.kernel.org,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 14 Sep 2018 17:37:52 -0700", "Message-Id": "<20180915003757.169108-10-jesse.brandeburg@intel.com>", "X-Mailer": "git-send-email 2.14.4", "In-Reply-To": "<20180915003757.169108-1-jesse.brandeburg@intel.com>", "References": "<20180915003757.169108-1-jesse.brandeburg@intel.com>", "Subject": "[Intel-wired-lan] [PATCH net-next v2 09/14] iavf: rename i40e_hw to\n\tiavf_hw", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Fix up the i40e_hw names to new name, including versions\ninside other strings.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\n---\n drivers/net/ethernet/intel/iavf/i40e_adminq.c | 42 +++++++--------\n drivers/net/ethernet/intel/iavf/i40e_alloc.h | 21 +++-----\n drivers/net/ethernet/intel/iavf/i40e_common.c | 30 +++++------\n drivers/net/ethernet/intel/iavf/i40e_prototype.h | 65 +++++++++++-------------\n drivers/net/ethernet/intel/iavf/i40e_type.h | 10 ++--\n drivers/net/ethernet/intel/iavf/iavf.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_main.c | 52 +++++++++----------\n drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 6 +--\n 9 files changed, 111 insertions(+), 119 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/i40e_adminq.c b/drivers/net/ethernet/intel/iavf/i40e_adminq.c\nindex 69dfdfd69796..480c3e8c38c8 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/iavf/i40e_adminq.c\n@@ -13,7 +13,7 @@\n *\n * This assumes the alloc_asq and alloc_arq functions have already been called\n **/\n-static void i40e_adminq_init_regs(struct i40e_hw *hw)\n+static void i40e_adminq_init_regs(struct iavf_hw *hw)\n {\n \t/* set head and tail registers in our local struct */\n \thw->aq.asq.tail = IAVF_VF_ATQT1;\n@@ -32,7 +32,7 @@ static void i40e_adminq_init_regs(struct i40e_hw *hw)\n * i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings\n * @hw: pointer to the hardware structure\n **/\n-static iavf_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw)\n {\n \tiavf_status ret_code;\n \n@@ -59,7 +59,7 @@ static iavf_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw)\n * i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings\n * @hw: pointer to the hardware structure\n **/\n-static iavf_status i40e_alloc_adminq_arq_ring(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw)\n {\n \tiavf_status ret_code;\n \n@@ -79,7 +79,7 @@ static iavf_status i40e_alloc_adminq_arq_ring(struct i40e_hw *hw)\n * This assumes the posted send buffers have already been cleaned\n * and de-allocated\n **/\n-static void i40e_free_adminq_asq(struct i40e_hw *hw)\n+static void i40e_free_adminq_asq(struct iavf_hw *hw)\n {\n \ti40e_free_dma_mem(hw, &hw->aq.asq.desc_buf);\n }\n@@ -91,7 +91,7 @@ static void i40e_free_adminq_asq(struct i40e_hw *hw)\n * This assumes the posted receive buffers have already been cleaned\n * and de-allocated\n **/\n-static void i40e_free_adminq_arq(struct i40e_hw *hw)\n+static void i40e_free_adminq_arq(struct iavf_hw *hw)\n {\n \ti40e_free_dma_mem(hw, &hw->aq.arq.desc_buf);\n }\n@@ -100,7 +100,7 @@ static void i40e_free_adminq_arq(struct i40e_hw *hw)\n * i40e_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue\n * @hw: pointer to the hardware structure\n **/\n-static iavf_status i40e_alloc_arq_bufs(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw)\n {\n \tiavf_status ret_code;\n \tstruct i40e_aq_desc *desc;\n@@ -167,7 +167,7 @@ static iavf_status i40e_alloc_arq_bufs(struct i40e_hw *hw)\n * i40e_alloc_asq_bufs - Allocate empty buffer structs for the send queue\n * @hw: pointer to the hardware structure\n **/\n-static iavf_status i40e_alloc_asq_bufs(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_asq_bufs(struct iavf_hw *hw)\n {\n \tiavf_status ret_code;\n \tstruct i40e_dma_mem *bi;\n@@ -207,7 +207,7 @@ static iavf_status i40e_alloc_asq_bufs(struct i40e_hw *hw)\n * i40e_free_arq_bufs - Free receive queue buffer info elements\n * @hw: pointer to the hardware structure\n **/\n-static void i40e_free_arq_bufs(struct i40e_hw *hw)\n+static void i40e_free_arq_bufs(struct iavf_hw *hw)\n {\n \tint i;\n \n@@ -226,7 +226,7 @@ static void i40e_free_arq_bufs(struct i40e_hw *hw)\n * i40e_free_asq_bufs - Free send queue buffer info elements\n * @hw: pointer to the hardware structure\n **/\n-static void i40e_free_asq_bufs(struct i40e_hw *hw)\n+static void i40e_free_asq_bufs(struct iavf_hw *hw)\n {\n \tint i;\n \n@@ -251,7 +251,7 @@ static void i40e_free_asq_bufs(struct i40e_hw *hw)\n *\n * Configure base address and length registers for the transmit queue\n **/\n-static iavf_status i40e_config_asq_regs(struct i40e_hw *hw)\n+static iavf_status i40e_config_asq_regs(struct iavf_hw *hw)\n {\n \tiavf_status ret_code = 0;\n \tu32 reg = 0;\n@@ -280,7 +280,7 @@ static iavf_status i40e_config_asq_regs(struct i40e_hw *hw)\n *\n * Configure base address and length registers for the receive (event queue)\n **/\n-static iavf_status i40e_config_arq_regs(struct i40e_hw *hw)\n+static iavf_status i40e_config_arq_regs(struct iavf_hw *hw)\n {\n \tiavf_status ret_code = 0;\n \tu32 reg = 0;\n@@ -319,7 +319,7 @@ static iavf_status i40e_config_arq_regs(struct i40e_hw *hw)\n * Do *NOT* hold the lock when calling this as the memory allocation routines\n * called are not going to be atomic context safe\n **/\n-static iavf_status i40e_init_asq(struct i40e_hw *hw)\n+static iavf_status i40e_init_asq(struct iavf_hw *hw)\n {\n \tiavf_status ret_code = 0;\n \n@@ -378,7 +378,7 @@ static iavf_status i40e_init_asq(struct i40e_hw *hw)\n * Do *NOT* hold the lock when calling this as the memory allocation routines\n * called are not going to be atomic context safe\n **/\n-static iavf_status i40e_init_arq(struct i40e_hw *hw)\n+static iavf_status i40e_init_arq(struct iavf_hw *hw)\n {\n \tiavf_status ret_code = 0;\n \n@@ -430,7 +430,7 @@ static iavf_status i40e_init_arq(struct i40e_hw *hw)\n *\n * The main shutdown routine for the Admin Send Queue\n **/\n-static iavf_status i40e_shutdown_asq(struct i40e_hw *hw)\n+static iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n {\n \tiavf_status ret_code = 0;\n \n@@ -464,7 +464,7 @@ static iavf_status i40e_shutdown_asq(struct i40e_hw *hw)\n *\n * The main shutdown routine for the Admin Receive Queue\n **/\n-static iavf_status i40e_shutdown_arq(struct i40e_hw *hw)\n+static iavf_status i40e_shutdown_arq(struct iavf_hw *hw)\n {\n \tiavf_status ret_code = 0;\n \n@@ -503,7 +503,7 @@ static iavf_status i40e_shutdown_arq(struct i40e_hw *hw)\n * - hw->aq.arq_buf_size\n * - hw->aq.asq_buf_size\n **/\n-iavf_status iavf_init_adminq(struct i40e_hw *hw)\n+iavf_status iavf_init_adminq(struct iavf_hw *hw)\n {\n \tiavf_status ret_code;\n \n@@ -547,7 +547,7 @@ iavf_status iavf_init_adminq(struct i40e_hw *hw)\n * iavf_shutdown_adminq - shutdown routine for the Admin Queue\n * @hw: pointer to the hardware structure\n **/\n-iavf_status iavf_shutdown_adminq(struct i40e_hw *hw)\n+iavf_status iavf_shutdown_adminq(struct iavf_hw *hw)\n {\n \tiavf_status ret_code = 0;\n \n@@ -566,7 +566,7 @@ iavf_status iavf_shutdown_adminq(struct i40e_hw *hw)\n *\n * returns the number of free desc\n **/\n-static u16 i40e_clean_asq(struct i40e_hw *hw)\n+static u16 i40e_clean_asq(struct iavf_hw *hw)\n {\n \tstruct i40e_adminq_ring *asq = &hw->aq.asq;\n \tstruct i40e_asq_cmd_details *details;\n@@ -608,7 +608,7 @@ static u16 i40e_clean_asq(struct i40e_hw *hw)\n * Returns true if the firmware has processed all descriptors on the\n * admin send queue. Returns false if there are still requests pending.\n **/\n-bool iavf_asq_done(struct i40e_hw *hw)\n+bool iavf_asq_done(struct iavf_hw *hw)\n {\n \t/* AQ designers suggest use of head for better\n \t * timing reliability than DD bit\n@@ -627,7 +627,7 @@ bool iavf_asq_done(struct i40e_hw *hw)\n * This is the main send command driver routine for the Admin Queue send\n * queue. It runs the queue, cleans the queue, etc\n **/\n-iavf_status iavf_asq_send_command(struct i40e_hw *hw, struct i40e_aq_desc *desc,\n+iavf_status iavf_asq_send_command(struct iavf_hw *hw, struct i40e_aq_desc *desc,\n \t\t\t\t void *buff, /* can be NULL */\n \t\t\t\t u16 buff_size,\n \t\t\t\t struct i40e_asq_cmd_details *cmd_details)\n@@ -839,7 +839,7 @@ void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, u16 opcode)\n * the contents through e. It can also return how many events are\n * left to process through 'pending'\n **/\n-iavf_status iavf_clean_arq_element(struct i40e_hw *hw,\n+iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n \t\t\t\t struct i40e_arq_event_info *e,\n \t\t\t\t u16 *pending)\n {\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_alloc.h b/drivers/net/ethernet/intel/iavf/i40e_alloc.h\nindex de3edf3bc8a4..e70d805dde42 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_alloc.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_alloc.h\n@@ -4,7 +4,7 @@\n #ifndef _I40E_ALLOC_H_\n #define _I40E_ALLOC_H_\n \n-struct i40e_hw;\n+struct iavf_hw;\n \n /* Memory allocation types */\n enum i40e_memory_type {\n@@ -20,16 +20,11 @@ enum i40e_memory_type {\n };\n \n /* prototype for functions used for dynamic memory allocation */\n-iavf_status i40e_allocate_dma_mem(struct i40e_hw *hw,\n-\t\t\t\t\t struct i40e_dma_mem *mem,\n-\t\t\t\t\t enum i40e_memory_type type,\n-\t\t\t\t\t u64 size, u32 alignment);\n-iavf_status i40e_free_dma_mem(struct i40e_hw *hw,\n-\t\t\t\t\tstruct i40e_dma_mem *mem);\n-iavf_status i40e_allocate_virt_mem(struct i40e_hw *hw,\n-\t\t\t\t\t struct i40e_virt_mem *mem,\n-\t\t\t\t\t u32 size);\n-iavf_status i40e_free_virt_mem(struct i40e_hw *hw,\n-\t\t\t\t\t struct i40e_virt_mem *mem);\n-\n+iavf_status i40e_allocate_dma_mem(struct iavf_hw *hw, struct i40e_dma_mem *mem,\n+\t\t\t\t enum i40e_memory_type type, u64 size,\n+\t\t\t\t u32 alignment);\n+iavf_status i40e_free_dma_mem(struct iavf_hw *hw, struct i40e_dma_mem *mem);\n+iavf_status i40e_allocate_virt_mem(struct iavf_hw *hw,\n+\t\t\t\t struct i40e_virt_mem *mem, u32 size);\n+iavf_status i40e_free_virt_mem(struct iavf_hw *hw, struct i40e_virt_mem *mem);\n #endif /* _I40E_ALLOC_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_common.c b/drivers/net/ethernet/intel/iavf/i40e_common.c\nindex b97e8925d20e..97eb06616cc0 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_common.c\n+++ b/drivers/net/ethernet/intel/iavf/i40e_common.c\n@@ -13,7 +13,7 @@\n * This function sets the mac type of the adapter based on the\n * vendor ID and device ID stored in the hw structure.\n **/\n-iavf_status i40e_set_mac_type(struct i40e_hw *hw)\n+iavf_status i40e_set_mac_type(struct iavf_hw *hw)\n {\n \tiavf_status status = 0;\n \n@@ -44,7 +44,7 @@ iavf_status i40e_set_mac_type(struct i40e_hw *hw)\n * @hw: pointer to the HW structure\n * @aq_err: the AQ error code to convert\n **/\n-const char *iavf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)\n+const char *iavf_aq_str(struct iavf_hw *hw, enum i40e_admin_queue_err aq_err)\n {\n \tswitch (aq_err) {\n \tcase I40E_AQ_RC_OK:\n@@ -104,7 +104,7 @@ const char *iavf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)\n * @hw: pointer to the HW structure\n * @stat_err: the status error code to convert\n **/\n-const char *iavf_stat_str(struct i40e_hw *hw, iavf_status stat_err)\n+const char *iavf_stat_str(struct iavf_hw *hw, iavf_status stat_err)\n {\n \tswitch (stat_err) {\n \tcase 0:\n@@ -257,7 +257,7 @@ const char *iavf_stat_str(struct i40e_hw *hw, iavf_status stat_err)\n *\n * Dumps debug log about adminq command with descriptor contents.\n **/\n-void iavf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,\n+void iavf_debug_aq(struct iavf_hw *hw, enum i40e_debug_mask mask, void *desc,\n \t\t void *buffer, u16 buf_len)\n {\n \tstruct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;\n@@ -310,7 +310,7 @@ void iavf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,\n *\n * Returns true if Queue is enabled else false.\n **/\n-bool iavf_check_asq_alive(struct i40e_hw *hw)\n+bool iavf_check_asq_alive(struct iavf_hw *hw)\n {\n \tif (hw->aq.asq.len)\n \t\treturn !!(rd32(hw, hw->aq.asq.len) &\n@@ -327,7 +327,7 @@ bool iavf_check_asq_alive(struct i40e_hw *hw)\n * Tell the Firmware that we're shutting down the AdminQ and whether\n * or not the driver is unloading as well.\n **/\n-iavf_status iavf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading)\n+iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading)\n {\n \tstruct i40e_aq_desc desc;\n \tstruct i40e_aqc_queue_shutdown *cmd =\n@@ -354,7 +354,7 @@ iavf_status iavf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading)\n *\n * Internal function to get or set RSS look up table\n **/\n-static iavf_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw,\n+static iavf_status i40e_aq_get_set_rss_lut(struct iavf_hw *hw,\n \t\t\t\t\t u16 vsi_id, bool pf_lut,\n \t\t\t\t\t u8 *lut, u16 lut_size,\n \t\t\t\t\t bool set)\n@@ -407,7 +407,7 @@ static iavf_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw,\n *\n * get the RSS lookup table, PF or VSI type\n **/\n-iavf_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n+iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n \t\t\t\tbool pf_lut, u8 *lut, u16 lut_size)\n {\n \treturn i40e_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size,\n@@ -424,7 +424,7 @@ iavf_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n *\n * set the RSS lookup table, PF or VSI type\n **/\n-iavf_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n+iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n \t\t\t\tbool pf_lut, u8 *lut, u16 lut_size)\n {\n \treturn i40e_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size, true);\n@@ -440,7 +440,7 @@ iavf_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n * get the RSS key per VSI\n **/\n static\n-iavf_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, u16 vsi_id,\n+iavf_status i40e_aq_get_set_rss_key(struct iavf_hw *hw, u16 vsi_id,\n \t\t\t\t struct i40e_aqc_get_set_rss_key_data *key,\n \t\t\t\t bool set)\n {\n@@ -479,7 +479,7 @@ iavf_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, u16 vsi_id,\n * @key: pointer to key info struct\n *\n **/\n-iavf_status iavf_aq_get_rss_key(struct i40e_hw *hw, u16 vsi_id,\n+iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 vsi_id,\n \t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key)\n {\n \treturn i40e_aq_get_set_rss_key(hw, vsi_id, key, false);\n@@ -493,7 +493,7 @@ iavf_status iavf_aq_get_rss_key(struct i40e_hw *hw, u16 vsi_id,\n *\n * set the RSS key per VSI\n **/\n-iavf_status iavf_aq_set_rss_key(struct i40e_hw *hw, u16 vsi_id,\n+iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 vsi_id,\n \t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key)\n {\n \treturn i40e_aq_get_set_rss_key(hw, vsi_id, key, true);\n@@ -877,7 +877,7 @@ struct i40e_rx_ptype_decoded iavf_ptype_lookup[] = {\n * is sent asynchronously, i.e. iavf_asq_send_command() does not wait for\n * completion before returning.\n **/\n-iavf_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,\n+iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,\n \t\t\t\t enum virtchnl_ops v_opcode,\n \t\t\t\t iavf_status v_retval, u8 *msg, u16 msglen,\n \t\t\t\t struct i40e_asq_cmd_details *cmd_details)\n@@ -914,7 +914,7 @@ iavf_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,\n * Given a VF resource message from the PF, populate the hw struct\n * with appropriate information.\n **/\n-void iavf_vf_parse_hw_config(struct i40e_hw *hw,\n+void iavf_vf_parse_hw_config(struct iavf_hw *hw,\n \t\t\t struct virtchnl_vf_resource *msg)\n {\n \tstruct virtchnl_vsi_resource *vsi_res;\n@@ -948,7 +948,7 @@ void iavf_vf_parse_hw_config(struct i40e_hw *hw,\n * as none will be forthcoming. Immediately after calling this function,\n * the admin queue should be shut down and (optionally) reinitialized.\n **/\n-iavf_status iavf_vf_reset(struct i40e_hw *hw)\n+iavf_status iavf_vf_reset(struct iavf_hw *hw)\n {\n \treturn iavf_aq_send_msg_to_pf(hw, VIRTCHNL_OP_RESET_VF,\n \t\t\t\t 0, NULL, 0, NULL);\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_prototype.h b/drivers/net/ethernet/intel/iavf/i40e_prototype.h\nindex f2d52ec2ece0..0497832bc53e 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_prototype.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_prototype.h\n@@ -16,42 +16,39 @@\n */\n \n /* adminq functions */\n-iavf_status iavf_init_adminq(struct i40e_hw *hw);\n-iavf_status iavf_shutdown_adminq(struct i40e_hw *hw);\n-void i40e_adminq_init_ring_data(struct i40e_hw *hw);\n-iavf_status iavf_clean_arq_element(struct i40e_hw *hw,\n-\t\t\t\t\t struct i40e_arq_event_info *e,\n-\t\t\t\t\t u16 *events_pending);\n-iavf_status iavf_asq_send_command(struct i40e_hw *hw,\n-\t\t\t\tstruct i40e_aq_desc *desc,\n-\t\t\t\tvoid *buff, /* can be NULL */\n-\t\t\t\tu16 buff_size,\n-\t\t\t\tstruct i40e_asq_cmd_details *cmd_details);\n-bool iavf_asq_done(struct i40e_hw *hw);\n+iavf_status iavf_init_adminq(struct iavf_hw *hw);\n+iavf_status iavf_shutdown_adminq(struct iavf_hw *hw);\n+void i40e_adminq_init_ring_data(struct iavf_hw *hw);\n+iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n+\t\t\t\t struct i40e_arq_event_info *e,\n+\t\t\t\t u16 *events_pending);\n+iavf_status iavf_asq_send_command(struct iavf_hw *hw, struct i40e_aq_desc *desc,\n+\t\t\t\t void *buff, /* can be NULL */\n+\t\t\t\t u16 buff_size,\n+\t\t\t\t struct i40e_asq_cmd_details *cmd_details);\n+bool iavf_asq_done(struct iavf_hw *hw);\n \n /* debug function for adminq */\n-void iavf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,\n-\t\t void *desc, void *buffer, u16 buf_len);\n+void iavf_debug_aq(struct iavf_hw *hw, enum i40e_debug_mask mask, void *desc,\n+\t\t void *buffer, u16 buf_len);\n \n-void i40e_idle_aq(struct i40e_hw *hw);\n-void iavf_resume_aq(struct i40e_hw *hw);\n-bool iavf_check_asq_alive(struct i40e_hw *hw);\n-iavf_status iavf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);\n-const char *iavf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err);\n-const char *iavf_stat_str(struct i40e_hw *hw, iavf_status stat_err);\n+void i40e_idle_aq(struct iavf_hw *hw);\n+void iavf_resume_aq(struct iavf_hw *hw);\n+bool iavf_check_asq_alive(struct iavf_hw *hw);\n+iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading);\n+const char *iavf_aq_str(struct iavf_hw *hw, enum i40e_admin_queue_err aq_err);\n+const char *iavf_stat_str(struct iavf_hw *hw, iavf_status stat_err);\n \n-iavf_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 seid,\n-\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size);\n-iavf_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 seid,\n-\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size);\n-iavf_status iavf_aq_get_rss_key(struct i40e_hw *hw,\n-\t\t\t\t u16 seid,\n-\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key);\n-iavf_status iavf_aq_set_rss_key(struct i40e_hw *hw,\n-\t\t\t\t u16 seid,\n-\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key);\n+iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 seid, bool pf_lut,\n+\t\t\t\tu8 *lut, u16 lut_size);\n+iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 seid,\n+\t\t\t\tbool pf_lut, u8 *lut, u16 lut_size);\n+iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 seid,\n+\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key);\n+iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 seid,\n+\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key);\n \n-iavf_status i40e_set_mac_type(struct i40e_hw *hw);\n+iavf_status i40e_set_mac_type(struct iavf_hw *hw);\n \n extern struct i40e_rx_ptype_decoded iavf_ptype_lookup[];\n \n@@ -61,10 +58,10 @@ static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)\n }\n \n /* i40e_common for VF drivers*/\n-void iavf_vf_parse_hw_config(struct i40e_hw *hw,\n+void iavf_vf_parse_hw_config(struct iavf_hw *hw,\n \t\t\t struct virtchnl_vf_resource *msg);\n-iavf_status iavf_vf_reset(struct i40e_hw *hw);\n-iavf_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,\n+iavf_status iavf_vf_reset(struct iavf_hw *hw);\n+iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,\n \t\t\t\t enum virtchnl_ops v_opcode,\n \t\t\t\t iavf_status v_retval, u8 *msg, u16 msglen,\n \t\t\t\t struct i40e_asq_cmd_details *cmd_details);\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_type.h b/drivers/net/ethernet/intel/iavf/i40e_type.h\nindex bcb1805a2f3a..2ce4203cd0b6 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_type.h\n@@ -20,8 +20,8 @@\n #define I40E_MAX_CHAINED_RX_BUFFERS\t5\n \n /* forward declaration */\n-struct i40e_hw;\n-typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);\n+struct iavf_hw;\n+typedef void (*I40E_ADMINQ_CALLBACK)(struct iavf_hw *, struct i40e_aq_desc *);\n \n /* Data type manipulation macros. */\n \n@@ -99,7 +99,7 @@ enum i40e_queue_type {\n \n #define I40E_HW_CAP_MAX_GPIO\t\t30\n /* Capabilities of a PF or a VF or the whole device */\n-struct i40e_hw_capabilities {\n+struct iavf_hw_capabilities {\n \tbool dcb;\n \tbool fcoe;\n \tu32 num_vsis;\n@@ -167,7 +167,7 @@ struct i40e_bus_info {\n #define I40E_MAX_TRAFFIC_CLASS\t\t8\n #define I40E_MAX_USER_PRIORITY\t\t8\n /* Port hardware description */\n-struct i40e_hw {\n+struct iavf_hw {\n \tu8 __iomem *hw_addr;\n \tvoid *back;\n \n@@ -183,7 +183,7 @@ struct i40e_hw {\n \tu8 revision_id;\n \n \t/* capabilities for entire device and PCI func */\n-\tstruct i40e_hw_capabilities dev_caps;\n+\tstruct iavf_hw_capabilities dev_caps;\n \n \t/* Admin Queue info */\n \tstruct i40e_adminq_info aq;\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 48ff5e924cfe..8e1a9f0348fe 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -307,7 +307,7 @@ struct iavf_adapter {\n \tstruct net_device *netdev;\n \tstruct pci_dev *pdev;\n \n-\tstruct i40e_hw hw; /* defined in i40e_type.h */\n+\tstruct iavf_hw hw; /* defined in i40e_type.h */\n \n \tenum iavf_state_t state;\n \tunsigned long crit_section;\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 5a3884b65ca8..63c5d97b1658 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -66,7 +66,7 @@ static struct workqueue_struct *iavf_wq;\n * @size: size of memory requested\n * @alignment: what to align the allocation to\n **/\n-iavf_status iavf_allocate_dma_mem_d(struct i40e_hw *hw,\n+iavf_status iavf_allocate_dma_mem_d(struct iavf_hw *hw,\n \t\t\t\t struct i40e_dma_mem *mem,\n \t\t\t\t u64 size, u32 alignment)\n {\n@@ -89,7 +89,7 @@ iavf_status iavf_allocate_dma_mem_d(struct i40e_hw *hw,\n * @hw: pointer to the HW structure\n * @mem: ptr to mem struct to free\n **/\n-iavf_status iavf_free_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem)\n+iavf_status iavf_free_dma_mem_d(struct iavf_hw *hw, struct i40e_dma_mem *mem)\n {\n \tstruct iavf_adapter *adapter = (struct iavf_adapter *)hw->back;\n \n@@ -106,7 +106,7 @@ iavf_status iavf_free_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem)\n * @mem: ptr to mem struct to fill out\n * @size: size of memory requested\n **/\n-iavf_status iavf_allocate_virt_mem_d(struct i40e_hw *hw,\n+iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw,\n \t\t\t\t struct i40e_virt_mem *mem, u32 size)\n {\n \tif (!mem)\n@@ -126,7 +126,7 @@ iavf_status iavf_allocate_virt_mem_d(struct i40e_hw *hw,\n * @hw: pointer to the HW structure\n * @mem: ptr to mem struct to free\n **/\n-iavf_status iavf_free_virt_mem_d(struct i40e_hw *hw,\n+iavf_status iavf_free_virt_mem_d(struct iavf_hw *hw,\n \t\t\t\t struct i40e_virt_mem *mem)\n {\n \tif (!mem)\n@@ -149,7 +149,7 @@ void iavf_debug_d(void *hw, u32 mask, char *fmt_str, ...)\n \tchar buf[512];\n \tva_list argptr;\n \n-\tif (!(mask & ((struct i40e_hw *)hw)->debug_mask))\n+\tif (!(mask & ((struct iavf_hw *)hw)->debug_mask))\n \t\treturn;\n \n \tva_start(argptr, fmt_str);\n@@ -191,7 +191,7 @@ static void iavf_tx_timeout(struct net_device *netdev)\n **/\n static void iavf_misc_irq_disable(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \n \tif (!adapter->msix_entries)\n \t\treturn;\n@@ -209,7 +209,7 @@ static void iavf_misc_irq_disable(struct iavf_adapter *adapter)\n **/\n static void iavf_misc_irq_enable(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \n \twr32(hw, IAVF_VFINT_DYN_CTL01, IAVF_VFINT_DYN_CTL01_INTENA_MASK |\n \t\t\t\t IAVF_VFINT_DYN_CTL01_ITR_INDX_MASK);\n@@ -225,7 +225,7 @@ static void iavf_misc_irq_enable(struct iavf_adapter *adapter)\n static void iavf_irq_disable(struct iavf_adapter *adapter)\n {\n \tint i;\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \n \tif (!adapter->msix_entries)\n \t\treturn;\n@@ -244,7 +244,7 @@ static void iavf_irq_disable(struct iavf_adapter *adapter)\n **/\n void iavf_irq_enable_queues(struct iavf_adapter *adapter, u32 mask)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tint i;\n \n \tfor (i = 1; i < adapter->num_msix_vectors; i++) {\n@@ -263,7 +263,7 @@ void iavf_irq_enable_queues(struct iavf_adapter *adapter, u32 mask)\n **/\n void iavf_irq_enable(struct iavf_adapter *adapter, bool flush)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \n \tiavf_misc_irq_enable(adapter);\n \tiavf_irq_enable_queues(adapter, ~0);\n@@ -281,7 +281,7 @@ static irqreturn_t iavf_msix_aq(int irq, void *data)\n {\n \tstruct net_device *netdev = data;\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \n \t/* handle non-queue interrupts, these reads clear the registers */\n \trd32(hw, IAVF_VFINT_ICR01);\n@@ -321,7 +321,7 @@ iavf_map_vector_to_rxq(struct iavf_adapter *adapter, int v_idx, int r_idx)\n {\n \tstruct i40e_q_vector *q_vector = &adapter->q_vectors[v_idx];\n \tstruct i40e_ring *rx_ring = &adapter->rx_rings[r_idx];\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \n \trx_ring->q_vector = q_vector;\n \trx_ring->next = q_vector->rx.ring;\n@@ -347,7 +347,7 @@ iavf_map_vector_to_txq(struct iavf_adapter *adapter, int v_idx, int t_idx)\n {\n \tstruct i40e_q_vector *q_vector = &adapter->q_vectors[v_idx];\n \tstruct i40e_ring *tx_ring = &adapter->tx_rings[t_idx];\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \n \ttx_ring->q_vector = q_vector;\n \ttx_ring->next = q_vector->tx.ring;\n@@ -594,7 +594,7 @@ static void iavf_free_misc_irq(struct iavf_adapter *adapter)\n **/\n static void iavf_configure_tx(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tint i;\n \n \tfor (i = 0; i < adapter->num_active_queues; i++)\n@@ -610,7 +610,7 @@ static void iavf_configure_tx(struct iavf_adapter *adapter)\n static void iavf_configure_rx(struct iavf_adapter *adapter)\n {\n \tunsigned int rx_buf_len = I40E_RXBUFFER_2048;\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tint i;\n \n \t/* Legacy Rx will always default to a 2048 buffer size. */\n@@ -822,7 +822,7 @@ iavf_mac_filter *iavf_add_filter(struct iavf_adapter *adapter,\n static int iavf_set_mac(struct net_device *netdev, void *p)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tstruct iavf_mac_filter *f;\n \tstruct sockaddr *addr = p;\n \n@@ -1253,7 +1253,7 @@ static int iavf_config_rss_aq(struct iavf_adapter *adapter)\n {\n \tstruct i40e_aqc_get_set_rss_key_data *rss_key =\n \t\t(struct i40e_aqc_get_set_rss_key_data *)adapter->rss_key;\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tint ret = 0;\n \n \tif (adapter->current_op != VIRTCHNL_OP_UNKNOWN) {\n@@ -1292,7 +1292,7 @@ static int iavf_config_rss_aq(struct iavf_adapter *adapter)\n **/\n static int iavf_config_rss_reg(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tu32 *dw;\n \tu16 i;\n \n@@ -1349,7 +1349,7 @@ static void iavf_fill_rss_lut(struct iavf_adapter *adapter)\n **/\n static int iavf_init_rss(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tint ret;\n \n \tif (!RSS_PF(adapter)) {\n@@ -1577,7 +1577,7 @@ static void iavf_watchdog_task(struct work_struct *work)\n \tstruct iavf_adapter *adapter = container_of(work,\n \t\t\t\t\t\t struct iavf_adapter,\n \t\t\t\t\t\t watchdog_task);\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tu32 reg_val;\n \n \tif (test_and_set_bit(__IAVF_IN_CRITICAL_TASK, &adapter->crit_section))\n@@ -1848,7 +1848,7 @@ static void iavf_reset_task(struct work_struct *work)\n \t\t\t\t\t\t reset_task);\n \tstruct virtchnl_vf_resource *vfres = adapter->vf_res;\n \tstruct net_device *netdev = adapter->netdev;\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tstruct iavf_vlan_filter *vlf;\n \tstruct iavf_cloud_filter *cf;\n \tstruct iavf_mac_filter *f;\n@@ -2044,7 +2044,7 @@ static void iavf_adminq_task(struct work_struct *work)\n {\n \tstruct iavf_adapter *adapter =\n \t\tcontainer_of(work, struct iavf_adapter, adminq_task);\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops v_op;\n \tiavf_status ret, v_ret;\n@@ -3241,7 +3241,7 @@ static const struct net_device_ops iavf_netdev_ops = {\n *\n * Returns 0 if device is ready to use, or -EBUSY if it's in reset.\n **/\n-static int iavf_check_reset_complete(struct i40e_hw *hw)\n+static int iavf_check_reset_complete(struct iavf_hw *hw)\n {\n \tu32 rstat;\n \tint i;\n@@ -3414,7 +3414,7 @@ static void iavf_init_task(struct work_struct *work)\n \t\t\t\t\t\t struct iavf_adapter,\n \t\t\t\t\t\t init_task.work);\n \tstruct net_device *netdev = adapter->netdev;\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tstruct pci_dev *pdev = adapter->pdev;\n \tint err, bufsz;\n \n@@ -3664,7 +3664,7 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n {\n \tstruct net_device *netdev;\n \tstruct iavf_adapter *adapter = NULL;\n-\tstruct i40e_hw *hw = NULL;\n+\tstruct iavf_hw *hw = NULL;\n \tint err;\n \n \terr = pci_enable_device(pdev);\n@@ -3870,7 +3870,7 @@ static void iavf_remove(struct pci_dev *pdev)\n \tstruct iavf_vlan_filter *vlf, *vlftmp;\n \tstruct iavf_mac_filter *f, *ftmp;\n \tstruct iavf_cloud_filter *cf, *cftmp;\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tint err;\n \t/* Indicate we are in remove and not to run reset_task */\n \tset_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section);\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\nindex 01ec3944c3c9..66d9f1bf9467 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n@@ -1627,7 +1627,7 @@ static inline u32 i40e_buildreg_itr(const int type, u16 itr)\n static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,\n \t\t\t\t\t struct i40e_q_vector *q_vector)\n {\n-\tstruct i40e_hw *hw = &vsi->back->hw;\n+\tstruct iavf_hw *hw = &vsi->back->hw;\n \tu32 intval;\n \n \t/* These will do nothing if dynamic updates are not enabled */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex 720fe010dbbd..fdf4c5ffbe6f 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -21,7 +21,7 @@\n static int iavf_send_pf_msg(struct iavf_adapter *adapter, enum virtchnl_ops op,\n \t\t\t u8 *msg, u16 len)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tiavf_status err;\n \n \tif (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED)\n@@ -66,7 +66,7 @@ int iavf_send_api_ver(struct iavf_adapter *adapter)\n int iavf_verify_api_ver(struct iavf_adapter *adapter)\n {\n \tstruct virtchnl_version_info *pf_vvi;\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops op;\n \tiavf_status err;\n@@ -188,7 +188,7 @@ static void iavf_validate_num_queues(struct iavf_adapter *adapter)\n **/\n int iavf_get_vf_config(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_hw *hw = &adapter->hw;\n+\tstruct iavf_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops op;\n \tiavf_status err;\n", "prefixes": [ "net-next", "v2", "09/14" ] }