Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1087278/?format=api
{ "id": 1087278, "url": "http://patchwork.ozlabs.org/api/patches/1087278/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190417221737.11460-5-alice.michael@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": "<20190417221737.11460-5-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-04-17T22:17:33", "name": "[next,S4,iavf,5/9] iavf: rename iavf_status structure flags", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6dc731694b2d71638ad761f7ae0b1c5b320fa5cd", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20190417221737.11460-5-alice.michael@intel.com/mbox/", "series": [ { "id": 103397, "url": "http://patchwork.ozlabs.org/api/series/103397/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103397", "date": "2019-04-17T22:17:29", "name": "[next,S4,iavf,1/9] iavf: Rename i40e_adminq* files to iavf_adminq*", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103397/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1087278/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1087278/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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 44kxW60j6sz9s47\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 18 Apr 2019 08:20:02 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 81473861F6;\n\tWed, 17 Apr 2019 22:20:00 +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 LaBbAlQKXLLp; Wed, 17 Apr 2019 22:19:56 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 86A95861D7;\n\tWed, 17 Apr 2019 22:19:55 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 27B0A1BF405\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 20DF32EE62\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:54 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id F6BhUfUe1KHy for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:42 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby silver.osuosl.org (Postfix) with ESMTPS id E513D2EC3D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:41 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t17 Apr 2019 15:19:40 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 15:19:40 -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.60,363,1549958400\"; d=\"scan'208\";a=\"136697248\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Wed, 17 Apr 2019 15:17:33 -0700", "Message-Id": "<20190417221737.11460-5-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190417221737.11460-1-alice.michael@intel.com>", "References": "<20190417221737.11460-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S4 iavf 5/9] iavf: rename iavf_status\n\tstructure flags", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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>", "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": "rename the flags inside of iavf_status from I40E_*\nto IAVF_*\n\nSigned-off-by: Alice Michael <alice.michael@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf_adminq.c | 42 +--\n drivers/net/ethernet/intel/iavf/iavf_adminq.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_client.c | 6 +-\n drivers/net/ethernet/intel/iavf/iavf_common.c | 266 +++++++++---------\n drivers/net/ethernet/intel/iavf/iavf_main.c | 38 +--\n drivers/net/ethernet/intel/iavf/iavf_status.h | 134 ++++-----\n .../net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +-\n 7 files changed, 245 insertions(+), 245 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf_adminq.c b/drivers/net/ethernet/intel/iavf/iavf_adminq.c\nindex 56172e2974bb..a764eb9838d1 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_adminq.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_adminq.c\n@@ -271,7 +271,7 @@ static enum iavf_status i40e_config_asq_regs(struct iavf_hw *hw)\n \t/* Check one register to verify that config was applied */\n \treg = rd32(hw, hw->aq.asq.bal);\n \tif (reg != lower_32_bits(hw->aq.asq.desc_buf.pa))\n-\t\tret_code = I40E_ERR_ADMIN_QUEUE_ERROR;\n+\t\tret_code = IAVF_ERR_ADMIN_QUEUE_ERROR;\n \n \treturn ret_code;\n }\n@@ -303,7 +303,7 @@ static enum iavf_status i40e_config_arq_regs(struct iavf_hw *hw)\n \t/* Check one register to verify that config was applied */\n \treg = rd32(hw, hw->aq.arq.bal);\n \tif (reg != lower_32_bits(hw->aq.arq.desc_buf.pa))\n-\t\tret_code = I40E_ERR_ADMIN_QUEUE_ERROR;\n+\t\tret_code = IAVF_ERR_ADMIN_QUEUE_ERROR;\n \n \treturn ret_code;\n }\n@@ -327,14 +327,14 @@ static enum iavf_status i40e_init_asq(struct iavf_hw *hw)\n \n \tif (hw->aq.asq.count > 0) {\n \t\t/* queue already initialized */\n-\t\tret_code = I40E_ERR_NOT_READY;\n+\t\tret_code = IAVF_ERR_NOT_READY;\n \t\tgoto init_adminq_exit;\n \t}\n \n \t/* verify input for valid configuration */\n \tif ((hw->aq.num_asq_entries == 0) ||\n \t (hw->aq.asq_buf_size == 0)) {\n-\t\tret_code = I40E_ERR_CONFIG;\n+\t\tret_code = IAVF_ERR_CONFIG;\n \t\tgoto init_adminq_exit;\n \t}\n \n@@ -386,14 +386,14 @@ static enum iavf_status i40e_init_arq(struct iavf_hw *hw)\n \n \tif (hw->aq.arq.count > 0) {\n \t\t/* queue already initialized */\n-\t\tret_code = I40E_ERR_NOT_READY;\n+\t\tret_code = IAVF_ERR_NOT_READY;\n \t\tgoto init_adminq_exit;\n \t}\n \n \t/* verify input for valid configuration */\n \tif ((hw->aq.num_arq_entries == 0) ||\n \t (hw->aq.arq_buf_size == 0)) {\n-\t\tret_code = I40E_ERR_CONFIG;\n+\t\tret_code = IAVF_ERR_CONFIG;\n \t\tgoto init_adminq_exit;\n \t}\n \n@@ -439,7 +439,7 @@ static enum iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n \tmutex_lock(&hw->aq.asq_mutex);\n \n \tif (hw->aq.asq.count == 0) {\n-\t\tret_code = I40E_ERR_NOT_READY;\n+\t\tret_code = IAVF_ERR_NOT_READY;\n \t\tgoto shutdown_asq_out;\n \t}\n \n@@ -473,7 +473,7 @@ static enum iavf_status i40e_shutdown_arq(struct iavf_hw *hw)\n \tmutex_lock(&hw->aq.arq_mutex);\n \n \tif (hw->aq.arq.count == 0) {\n-\t\tret_code = I40E_ERR_NOT_READY;\n+\t\tret_code = IAVF_ERR_NOT_READY;\n \t\tgoto shutdown_arq_out;\n \t}\n \n@@ -514,7 +514,7 @@ enum iavf_status iavf_init_adminq(struct iavf_hw *hw)\n \t (hw->aq.num_asq_entries == 0) ||\n \t (hw->aq.arq_buf_size == 0) ||\n \t (hw->aq.asq_buf_size == 0)) {\n-\t\tret_code = I40E_ERR_CONFIG;\n+\t\tret_code = IAVF_ERR_CONFIG;\n \t\tgoto init_adminq_exit;\n \t}\n \n@@ -648,7 +648,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \tif (hw->aq.asq.count == 0) {\n \t\tiavf_debug(hw, IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQTX: Admin queue not initialized.\\n\");\n-\t\tstatus = I40E_ERR_QUEUE_EMPTY;\n+\t\tstatus = IAVF_ERR_QUEUE_EMPTY;\n \t\tgoto asq_send_command_error;\n \t}\n \n@@ -658,7 +658,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \tif (val >= hw->aq.num_asq_entries) {\n \t\tiavf_debug(hw, IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQTX: head overrun at %d\\n\", val);\n-\t\tstatus = I40E_ERR_QUEUE_EMPTY;\n+\t\tstatus = IAVF_ERR_QUEUE_EMPTY;\n \t\tgoto asq_send_command_error;\n \t}\n \n@@ -689,7 +689,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \t\t\t IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQTX: Invalid buffer size: %d.\\n\",\n \t\t\t buff_size);\n-\t\tstatus = I40E_ERR_INVALID_SIZE;\n+\t\tstatus = IAVF_ERR_INVALID_SIZE;\n \t\tgoto asq_send_command_error;\n \t}\n \n@@ -697,7 +697,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \t\tiavf_debug(hw,\n \t\t\t IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQTX: Async flag not set along with postpone flag\");\n-\t\tstatus = I40E_ERR_PARAM;\n+\t\tstatus = IAVF_ERR_PARAM;\n \t\tgoto asq_send_command_error;\n \t}\n \n@@ -712,7 +712,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \t\tiavf_debug(hw,\n \t\t\t IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQTX: Error queue is full.\\n\");\n-\t\tstatus = I40E_ERR_ADMIN_QUEUE_FULL;\n+\t\tstatus = IAVF_ERR_ADMIN_QUEUE_FULL;\n \t\tgoto asq_send_command_error;\n \t}\n \n@@ -784,9 +784,9 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \t\tif ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_OK)\n \t\t\tstatus = 0;\n \t\telse if ((enum iavf_admin_queue_err)retval == IAVF_AQ_RC_EBUSY)\n-\t\t\tstatus = I40E_ERR_NOT_READY;\n+\t\t\tstatus = IAVF_ERR_NOT_READY;\n \t\telse\n-\t\t\tstatus = I40E_ERR_ADMIN_QUEUE_ERROR;\n+\t\t\tstatus = IAVF_ERR_ADMIN_QUEUE_ERROR;\n \t\thw->aq.asq_last_status = (enum iavf_admin_queue_err)retval;\n \t}\n \n@@ -804,11 +804,11 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \t\tif (rd32(hw, hw->aq.asq.len) & IAVF_VF_ATQLEN1_ATQCRIT_MASK) {\n \t\t\tiavf_debug(hw, IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t\t \"AQTX: AQ Critical error.\\n\");\n-\t\t\tstatus = I40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR;\n+\t\t\tstatus = IAVF_ERR_ADMIN_QUEUE_CRITICAL_ERROR;\n \t\t} else {\n \t\t\tiavf_debug(hw, IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t\t \"AQTX: Writeback timeout.\\n\");\n-\t\t\tstatus = I40E_ERR_ADMIN_QUEUE_TIMEOUT;\n+\t\t\tstatus = IAVF_ERR_ADMIN_QUEUE_TIMEOUT;\n \t\t}\n \t}\n \n@@ -864,7 +864,7 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n \tif (hw->aq.arq.count == 0) {\n \t\tiavf_debug(hw, IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQRX: Admin queue not initialized.\\n\");\n-\t\tret_code = I40E_ERR_QUEUE_EMPTY;\n+\t\tret_code = IAVF_ERR_QUEUE_EMPTY;\n \t\tgoto clean_arq_element_err;\n \t}\n \n@@ -872,7 +872,7 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n \tntu = rd32(hw, hw->aq.arq.head) & IAVF_VF_ARQH1_ARQH_MASK;\n \tif (ntu == ntc) {\n \t\t/* nothing to do - shouldn't need to update ring's values */\n-\t\tret_code = I40E_ERR_ADMIN_QUEUE_NO_WORK;\n+\t\tret_code = IAVF_ERR_ADMIN_QUEUE_NO_WORK;\n \t\tgoto clean_arq_element_out;\n \t}\n \n@@ -884,7 +884,7 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n \t\t(enum iavf_admin_queue_err)le16_to_cpu(desc->retval);\n \tflags = le16_to_cpu(desc->flags);\n \tif (flags & IAVF_AQ_FLAG_ERR) {\n-\t\tret_code = I40E_ERR_ADMIN_QUEUE_ERROR;\n+\t\tret_code = IAVF_ERR_ADMIN_QUEUE_ERROR;\n \t\tiavf_debug(hw,\n \t\t\t IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQRX: Event received with error 0x%X.\\n\",\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_adminq.h b/drivers/net/ethernet/intel/iavf/iavf_adminq.h\nindex 60a6a41d21a0..300320e034d2 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_adminq.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_adminq.h\n@@ -117,7 +117,7 @@ static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc)\n \t};\n \n \t/* aq_rc is invalid if AQ timed out */\n-\tif (aq_ret == I40E_ERR_ADMIN_QUEUE_TIMEOUT)\n+\tif (aq_ret == IAVF_ERR_ADMIN_QUEUE_TIMEOUT)\n \t\treturn -EAGAIN;\n \n \tif (!((u32)aq_rc < (sizeof(aq_to_posix) / sizeof((aq_to_posix)[0]))))\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_client.c b/drivers/net/ethernet/intel/iavf/iavf_client.c\nindex 3cdcaac75b70..196ce7324ea4 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_client.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_client.c\n@@ -142,7 +142,7 @@ static int iavf_client_release_qvlist(struct i40e_info *ldev)\n \n \terr = iavf_aq_send_msg_to_pf(&adapter->hw,\n \t\t\t\t VIRTCHNL_OP_RELEASE_IWARP_IRQ_MAP,\n-\t\t\t\t I40E_SUCCESS, NULL, 0, NULL);\n+\t\t\t\t IAVF_SUCCESS, NULL, 0, NULL);\n \n \tif (err)\n \t\tdev_err(&adapter->pdev->dev,\n@@ -426,7 +426,7 @@ static u32 iavf_client_virtchnl_send(struct i40e_info *ldev,\n \t\treturn -EAGAIN;\n \n \terr = iavf_aq_send_msg_to_pf(&adapter->hw, VIRTCHNL_OP_IWARP,\n-\t\t\t\t I40E_SUCCESS, msg, len, NULL);\n+\t\t\t\t IAVF_SUCCESS, msg, len, NULL);\n \tif (err)\n \t\tdev_err(&adapter->pdev->dev, \"Unable to send iWarp message to PF, error %d, aq status %d\\n\",\n \t\t\terr, adapter->hw.aq.asq_last_status);\n@@ -474,7 +474,7 @@ static int iavf_client_setup_qvlist(struct i40e_info *ldev,\n \n \tadapter->client_pending |= BIT(VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP);\n \terr = iavf_aq_send_msg_to_pf(&adapter->hw,\n-\t\t\t\tVIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP, I40E_SUCCESS,\n+\t\t\t\tVIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP, IAVF_SUCCESS,\n \t\t\t\t(u8 *)v_qvlist_info, msg_size, NULL);\n \n \tif (err) {\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c\nindex 137e06c0c4ee..05ae5ce06537 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_common.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_common.c\n@@ -32,7 +32,7 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw)\n \t\t\tbreak;\n \t\t}\n \t} else {\n-\t\tstatus = I40E_ERR_DEVICE_NOT_SUPPORTED;\n+\t\tstatus = IAVF_ERR_DEVICE_NOT_SUPPORTED;\n \t}\n \n \thw_dbg(hw, \"found mac: %d, returns: %d\\n\", hw->mac.type, status);\n@@ -109,138 +109,138 @@ const char *iavf_stat_str(struct iavf_hw *hw, enum iavf_status stat_err)\n \tswitch (stat_err) {\n \tcase 0:\n \t\treturn \"OK\";\n-\tcase I40E_ERR_NVM:\n-\t\treturn \"I40E_ERR_NVM\";\n-\tcase I40E_ERR_NVM_CHECKSUM:\n-\t\treturn \"I40E_ERR_NVM_CHECKSUM\";\n-\tcase I40E_ERR_PHY:\n-\t\treturn \"I40E_ERR_PHY\";\n-\tcase I40E_ERR_CONFIG:\n-\t\treturn \"I40E_ERR_CONFIG\";\n-\tcase I40E_ERR_PARAM:\n-\t\treturn \"I40E_ERR_PARAM\";\n-\tcase I40E_ERR_MAC_TYPE:\n-\t\treturn \"I40E_ERR_MAC_TYPE\";\n-\tcase I40E_ERR_UNKNOWN_PHY:\n-\t\treturn \"I40E_ERR_UNKNOWN_PHY\";\n-\tcase I40E_ERR_LINK_SETUP:\n-\t\treturn \"I40E_ERR_LINK_SETUP\";\n-\tcase I40E_ERR_ADAPTER_STOPPED:\n-\t\treturn \"I40E_ERR_ADAPTER_STOPPED\";\n-\tcase I40E_ERR_INVALID_MAC_ADDR:\n-\t\treturn \"I40E_ERR_INVALID_MAC_ADDR\";\n-\tcase I40E_ERR_DEVICE_NOT_SUPPORTED:\n-\t\treturn \"I40E_ERR_DEVICE_NOT_SUPPORTED\";\n-\tcase I40E_ERR_MASTER_REQUESTS_PENDING:\n-\t\treturn \"I40E_ERR_MASTER_REQUESTS_PENDING\";\n-\tcase I40E_ERR_INVALID_LINK_SETTINGS:\n-\t\treturn \"I40E_ERR_INVALID_LINK_SETTINGS\";\n-\tcase I40E_ERR_AUTONEG_NOT_COMPLETE:\n-\t\treturn \"I40E_ERR_AUTONEG_NOT_COMPLETE\";\n-\tcase I40E_ERR_RESET_FAILED:\n-\t\treturn \"I40E_ERR_RESET_FAILED\";\n-\tcase I40E_ERR_SWFW_SYNC:\n-\t\treturn \"I40E_ERR_SWFW_SYNC\";\n-\tcase I40E_ERR_NO_AVAILABLE_VSI:\n-\t\treturn \"I40E_ERR_NO_AVAILABLE_VSI\";\n-\tcase I40E_ERR_NO_MEMORY:\n-\t\treturn \"I40E_ERR_NO_MEMORY\";\n-\tcase I40E_ERR_BAD_PTR:\n-\t\treturn \"I40E_ERR_BAD_PTR\";\n-\tcase I40E_ERR_RING_FULL:\n-\t\treturn \"I40E_ERR_RING_FULL\";\n-\tcase I40E_ERR_INVALID_PD_ID:\n-\t\treturn \"I40E_ERR_INVALID_PD_ID\";\n-\tcase I40E_ERR_INVALID_QP_ID:\n-\t\treturn \"I40E_ERR_INVALID_QP_ID\";\n-\tcase I40E_ERR_INVALID_CQ_ID:\n-\t\treturn \"I40E_ERR_INVALID_CQ_ID\";\n-\tcase I40E_ERR_INVALID_CEQ_ID:\n-\t\treturn \"I40E_ERR_INVALID_CEQ_ID\";\n-\tcase I40E_ERR_INVALID_AEQ_ID:\n-\t\treturn \"I40E_ERR_INVALID_AEQ_ID\";\n-\tcase I40E_ERR_INVALID_SIZE:\n-\t\treturn \"I40E_ERR_INVALID_SIZE\";\n-\tcase I40E_ERR_INVALID_ARP_INDEX:\n-\t\treturn \"I40E_ERR_INVALID_ARP_INDEX\";\n-\tcase I40E_ERR_INVALID_FPM_FUNC_ID:\n-\t\treturn \"I40E_ERR_INVALID_FPM_FUNC_ID\";\n-\tcase I40E_ERR_QP_INVALID_MSG_SIZE:\n-\t\treturn \"I40E_ERR_QP_INVALID_MSG_SIZE\";\n-\tcase I40E_ERR_QP_TOOMANY_WRS_POSTED:\n-\t\treturn \"I40E_ERR_QP_TOOMANY_WRS_POSTED\";\n-\tcase I40E_ERR_INVALID_FRAG_COUNT:\n-\t\treturn \"I40E_ERR_INVALID_FRAG_COUNT\";\n-\tcase I40E_ERR_QUEUE_EMPTY:\n-\t\treturn \"I40E_ERR_QUEUE_EMPTY\";\n-\tcase I40E_ERR_INVALID_ALIGNMENT:\n-\t\treturn \"I40E_ERR_INVALID_ALIGNMENT\";\n-\tcase I40E_ERR_FLUSHED_QUEUE:\n-\t\treturn \"I40E_ERR_FLUSHED_QUEUE\";\n-\tcase I40E_ERR_INVALID_PUSH_PAGE_INDEX:\n-\t\treturn \"I40E_ERR_INVALID_PUSH_PAGE_INDEX\";\n-\tcase I40E_ERR_INVALID_IMM_DATA_SIZE:\n-\t\treturn \"I40E_ERR_INVALID_IMM_DATA_SIZE\";\n-\tcase I40E_ERR_TIMEOUT:\n-\t\treturn \"I40E_ERR_TIMEOUT\";\n-\tcase I40E_ERR_OPCODE_MISMATCH:\n-\t\treturn \"I40E_ERR_OPCODE_MISMATCH\";\n-\tcase I40E_ERR_CQP_COMPL_ERROR:\n-\t\treturn \"I40E_ERR_CQP_COMPL_ERROR\";\n-\tcase I40E_ERR_INVALID_VF_ID:\n-\t\treturn \"I40E_ERR_INVALID_VF_ID\";\n-\tcase I40E_ERR_INVALID_HMCFN_ID:\n-\t\treturn \"I40E_ERR_INVALID_HMCFN_ID\";\n-\tcase I40E_ERR_BACKING_PAGE_ERROR:\n-\t\treturn \"I40E_ERR_BACKING_PAGE_ERROR\";\n-\tcase I40E_ERR_NO_PBLCHUNKS_AVAILABLE:\n-\t\treturn \"I40E_ERR_NO_PBLCHUNKS_AVAILABLE\";\n-\tcase I40E_ERR_INVALID_PBLE_INDEX:\n-\t\treturn \"I40E_ERR_INVALID_PBLE_INDEX\";\n-\tcase I40E_ERR_INVALID_SD_INDEX:\n-\t\treturn \"I40E_ERR_INVALID_SD_INDEX\";\n-\tcase I40E_ERR_INVALID_PAGE_DESC_INDEX:\n-\t\treturn \"I40E_ERR_INVALID_PAGE_DESC_INDEX\";\n-\tcase I40E_ERR_INVALID_SD_TYPE:\n-\t\treturn \"I40E_ERR_INVALID_SD_TYPE\";\n-\tcase I40E_ERR_MEMCPY_FAILED:\n-\t\treturn \"I40E_ERR_MEMCPY_FAILED\";\n-\tcase I40E_ERR_INVALID_HMC_OBJ_INDEX:\n-\t\treturn \"I40E_ERR_INVALID_HMC_OBJ_INDEX\";\n-\tcase I40E_ERR_INVALID_HMC_OBJ_COUNT:\n-\t\treturn \"I40E_ERR_INVALID_HMC_OBJ_COUNT\";\n-\tcase I40E_ERR_INVALID_SRQ_ARM_LIMIT:\n-\t\treturn \"I40E_ERR_INVALID_SRQ_ARM_LIMIT\";\n-\tcase I40E_ERR_SRQ_ENABLED:\n-\t\treturn \"I40E_ERR_SRQ_ENABLED\";\n-\tcase I40E_ERR_ADMIN_QUEUE_ERROR:\n-\t\treturn \"I40E_ERR_ADMIN_QUEUE_ERROR\";\n-\tcase I40E_ERR_ADMIN_QUEUE_TIMEOUT:\n-\t\treturn \"I40E_ERR_ADMIN_QUEUE_TIMEOUT\";\n-\tcase I40E_ERR_BUF_TOO_SHORT:\n-\t\treturn \"I40E_ERR_BUF_TOO_SHORT\";\n-\tcase I40E_ERR_ADMIN_QUEUE_FULL:\n-\t\treturn \"I40E_ERR_ADMIN_QUEUE_FULL\";\n-\tcase I40E_ERR_ADMIN_QUEUE_NO_WORK:\n-\t\treturn \"I40E_ERR_ADMIN_QUEUE_NO_WORK\";\n-\tcase I40E_ERR_BAD_IWARP_CQE:\n-\t\treturn \"I40E_ERR_BAD_IWARP_CQE\";\n-\tcase I40E_ERR_NVM_BLANK_MODE:\n-\t\treturn \"I40E_ERR_NVM_BLANK_MODE\";\n-\tcase I40E_ERR_NOT_IMPLEMENTED:\n-\t\treturn \"I40E_ERR_NOT_IMPLEMENTED\";\n-\tcase I40E_ERR_PE_DOORBELL_NOT_ENABLED:\n-\t\treturn \"I40E_ERR_PE_DOORBELL_NOT_ENABLED\";\n-\tcase I40E_ERR_DIAG_TEST_FAILED:\n-\t\treturn \"I40E_ERR_DIAG_TEST_FAILED\";\n-\tcase I40E_ERR_NOT_READY:\n-\t\treturn \"I40E_ERR_NOT_READY\";\n-\tcase I40E_NOT_SUPPORTED:\n-\t\treturn \"I40E_NOT_SUPPORTED\";\n-\tcase I40E_ERR_FIRMWARE_API_VERSION:\n-\t\treturn \"I40E_ERR_FIRMWARE_API_VERSION\";\n-\tcase I40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR:\n-\t\treturn \"I40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR\";\n+\tcase IAVF_ERR_NVM:\n+\t\treturn \"IAVF_ERR_NVM\";\n+\tcase IAVF_ERR_NVM_CHECKSUM:\n+\t\treturn \"IAVF_ERR_NVM_CHECKSUM\";\n+\tcase IAVF_ERR_PHY:\n+\t\treturn \"IAVF_ERR_PHY\";\n+\tcase IAVF_ERR_CONFIG:\n+\t\treturn \"IAVF_ERR_CONFIG\";\n+\tcase IAVF_ERR_PARAM:\n+\t\treturn \"IAVF_ERR_PARAM\";\n+\tcase IAVF_ERR_MAC_TYPE:\n+\t\treturn \"IAVF_ERR_MAC_TYPE\";\n+\tcase IAVF_ERR_UNKNOWN_PHY:\n+\t\treturn \"IAVF_ERR_UNKNOWN_PHY\";\n+\tcase IAVF_ERR_LINK_SETUP:\n+\t\treturn \"IAVF_ERR_LINK_SETUP\";\n+\tcase IAVF_ERR_ADAPTER_STOPPED:\n+\t\treturn \"IAVF_ERR_ADAPTER_STOPPED\";\n+\tcase IAVF_ERR_INVALID_MAC_ADDR:\n+\t\treturn \"IAVF_ERR_INVALID_MAC_ADDR\";\n+\tcase IAVF_ERR_DEVICE_NOT_SUPPORTED:\n+\t\treturn \"IAVF_ERR_DEVICE_NOT_SUPPORTED\";\n+\tcase IAVF_ERR_MASTER_REQUESTS_PENDING:\n+\t\treturn \"IAVF_ERR_MASTER_REQUESTS_PENDING\";\n+\tcase IAVF_ERR_INVALID_LINK_SETTINGS:\n+\t\treturn \"IAVF_ERR_INVALID_LINK_SETTINGS\";\n+\tcase IAVF_ERR_AUTONEG_NOT_COMPLETE:\n+\t\treturn \"IAVF_ERR_AUTONEG_NOT_COMPLETE\";\n+\tcase IAVF_ERR_RESET_FAILED:\n+\t\treturn \"IAVF_ERR_RESET_FAILED\";\n+\tcase IAVF_ERR_SWFW_SYNC:\n+\t\treturn \"IAVF_ERR_SWFW_SYNC\";\n+\tcase IAVF_ERR_NO_AVAILABLE_VSI:\n+\t\treturn \"IAVF_ERR_NO_AVAILABLE_VSI\";\n+\tcase IAVF_ERR_NO_MEMORY:\n+\t\treturn \"IAVF_ERR_NO_MEMORY\";\n+\tcase IAVF_ERR_BAD_PTR:\n+\t\treturn \"IAVF_ERR_BAD_PTR\";\n+\tcase IAVF_ERR_RING_FULL:\n+\t\treturn \"IAVF_ERR_RING_FULL\";\n+\tcase IAVF_ERR_INVALID_PD_ID:\n+\t\treturn \"IAVF_ERR_INVALID_PD_ID\";\n+\tcase IAVF_ERR_INVALID_QP_ID:\n+\t\treturn \"IAVF_ERR_INVALID_QP_ID\";\n+\tcase IAVF_ERR_INVALID_CQ_ID:\n+\t\treturn \"IAVF_ERR_INVALID_CQ_ID\";\n+\tcase IAVF_ERR_INVALID_CEQ_ID:\n+\t\treturn \"IAVF_ERR_INVALID_CEQ_ID\";\n+\tcase IAVF_ERR_INVALID_AEQ_ID:\n+\t\treturn \"IAVF_ERR_INVALID_AEQ_ID\";\n+\tcase IAVF_ERR_INVALID_SIZE:\n+\t\treturn \"IAVF_ERR_INVALID_SIZE\";\n+\tcase IAVF_ERR_INVALID_ARP_INDEX:\n+\t\treturn \"IAVF_ERR_INVALID_ARP_INDEX\";\n+\tcase IAVF_ERR_INVALID_FPM_FUNC_ID:\n+\t\treturn \"IAVF_ERR_INVALID_FPM_FUNC_ID\";\n+\tcase IAVF_ERR_QP_INVALID_MSG_SIZE:\n+\t\treturn \"IAVF_ERR_QP_INVALID_MSG_SIZE\";\n+\tcase IAVF_ERR_QP_TOOMANY_WRS_POSTED:\n+\t\treturn \"IAVF_ERR_QP_TOOMANY_WRS_POSTED\";\n+\tcase IAVF_ERR_INVALID_FRAG_COUNT:\n+\t\treturn \"IAVF_ERR_INVALID_FRAG_COUNT\";\n+\tcase IAVF_ERR_QUEUE_EMPTY:\n+\t\treturn \"IAVF_ERR_QUEUE_EMPTY\";\n+\tcase IAVF_ERR_INVALID_ALIGNMENT:\n+\t\treturn \"IAVF_ERR_INVALID_ALIGNMENT\";\n+\tcase IAVF_ERR_FLUSHED_QUEUE:\n+\t\treturn \"IAVF_ERR_FLUSHED_QUEUE\";\n+\tcase IAVF_ERR_INVALID_PUSH_PAGE_INDEX:\n+\t\treturn \"IAVF_ERR_INVALID_PUSH_PAGE_INDEX\";\n+\tcase IAVF_ERR_INVALID_IMM_DATA_SIZE:\n+\t\treturn \"IAVF_ERR_INVALID_IMM_DATA_SIZE\";\n+\tcase IAVF_ERR_TIMEOUT:\n+\t\treturn \"IAVF_ERR_TIMEOUT\";\n+\tcase IAVF_ERR_OPCODE_MISMATCH:\n+\t\treturn \"IAVF_ERR_OPCODE_MISMATCH\";\n+\tcase IAVF_ERR_CQP_COMPL_ERROR:\n+\t\treturn \"IAVF_ERR_CQP_COMPL_ERROR\";\n+\tcase IAVF_ERR_INVALID_VF_ID:\n+\t\treturn \"IAVF_ERR_INVALID_VF_ID\";\n+\tcase IAVF_ERR_INVALID_HMCFN_ID:\n+\t\treturn \"IAVF_ERR_INVALID_HMCFN_ID\";\n+\tcase IAVF_ERR_BACKING_PAGE_ERROR:\n+\t\treturn \"IAVF_ERR_BACKING_PAGE_ERROR\";\n+\tcase IAVF_ERR_NO_PBLCHUNKS_AVAILABLE:\n+\t\treturn \"IAVF_ERR_NO_PBLCHUNKS_AVAILABLE\";\n+\tcase IAVF_ERR_INVALID_PBLE_INDEX:\n+\t\treturn \"IAVF_ERR_INVALID_PBLE_INDEX\";\n+\tcase IAVF_ERR_INVALID_SD_INDEX:\n+\t\treturn \"IAVF_ERR_INVALID_SD_INDEX\";\n+\tcase IAVF_ERR_INVALID_PAGE_DESC_INDEX:\n+\t\treturn \"IAVF_ERR_INVALID_PAGE_DESC_INDEX\";\n+\tcase IAVF_ERR_INVALID_SD_TYPE:\n+\t\treturn \"IAVF_ERR_INVALID_SD_TYPE\";\n+\tcase IAVF_ERR_MEMCPY_FAILED:\n+\t\treturn \"IAVF_ERR_MEMCPY_FAILED\";\n+\tcase IAVF_ERR_INVALID_HMC_OBJ_INDEX:\n+\t\treturn \"IAVF_ERR_INVALID_HMC_OBJ_INDEX\";\n+\tcase IAVF_ERR_INVALID_HMC_OBJ_COUNT:\n+\t\treturn \"IAVF_ERR_INVALID_HMC_OBJ_COUNT\";\n+\tcase IAVF_ERR_INVALID_SRQ_ARM_LIMIT:\n+\t\treturn \"IAVF_ERR_INVALID_SRQ_ARM_LIMIT\";\n+\tcase IAVF_ERR_SRQ_ENABLED:\n+\t\treturn \"IAVF_ERR_SRQ_ENABLED\";\n+\tcase IAVF_ERR_ADMIN_QUEUE_ERROR:\n+\t\treturn \"IAVF_ERR_ADMIN_QUEUE_ERROR\";\n+\tcase IAVF_ERR_ADMIN_QUEUE_TIMEOUT:\n+\t\treturn \"IAVF_ERR_ADMIN_QUEUE_TIMEOUT\";\n+\tcase IAVF_ERR_BUF_TOO_SHORT:\n+\t\treturn \"IAVF_ERR_BUF_TOO_SHORT\";\n+\tcase IAVF_ERR_ADMIN_QUEUE_FULL:\n+\t\treturn \"IAVF_ERR_ADMIN_QUEUE_FULL\";\n+\tcase IAVF_ERR_ADMIN_QUEUE_NO_WORK:\n+\t\treturn \"IAVF_ERR_ADMIN_QUEUE_NO_WORK\";\n+\tcase IAVF_ERR_BAD_IWARP_CQE:\n+\t\treturn \"IAVF_ERR_BAD_IWARP_CQE\";\n+\tcase IAVF_ERR_NVM_BLANK_MODE:\n+\t\treturn \"IAVF_ERR_NVM_BLANK_MODE\";\n+\tcase IAVF_ERR_NOT_IMPLEMENTED:\n+\t\treturn \"IAVF_ERR_NOT_IMPLEMENTED\";\n+\tcase IAVF_ERR_PE_DOORBELL_NOT_ENABLED:\n+\t\treturn \"IAVF_ERR_PE_DOORBELL_NOT_ENABLED\";\n+\tcase IAVF_ERR_DIAG_TEST_FAILED:\n+\t\treturn \"IAVF_ERR_DIAG_TEST_FAILED\";\n+\tcase IAVF_ERR_NOT_READY:\n+\t\treturn \"IAVF_ERR_NOT_READY\";\n+\tcase IAVF_NOT_SUPPORTED:\n+\t\treturn \"IAVF_NOT_SUPPORTED\";\n+\tcase IAVF_ERR_FIRMWARE_API_VERSION:\n+\t\treturn \"IAVF_ERR_FIRMWARE_API_VERSION\";\n+\tcase IAVF_ERR_ADMIN_QUEUE_CRITICAL_ERROR:\n+\t\treturn \"IAVF_ERR_ADMIN_QUEUE_CRITICAL_ERROR\";\n \t}\n \n \tsnprintf(hw->err_str, sizeof(hw->err_str), \"%d\", stat_err);\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex d1f4a3329abb..44d2150adb37 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -73,7 +73,7 @@ enum iavf_status iavf_allocate_dma_mem_d(struct iavf_hw *hw,\n \tstruct iavf_adapter *adapter = (struct iavf_adapter *)hw->back;\n \n \tif (!mem)\n-\t\treturn I40E_ERR_PARAM;\n+\t\treturn IAVF_ERR_PARAM;\n \n \tmem->size = ALIGN(size, alignment);\n \tmem->va = dma_alloc_coherent(&adapter->pdev->dev, mem->size,\n@@ -81,7 +81,7 @@ enum iavf_status iavf_allocate_dma_mem_d(struct iavf_hw *hw,\n \tif (mem->va)\n \t\treturn 0;\n \telse\n-\t\treturn I40E_ERR_NO_MEMORY;\n+\t\treturn IAVF_ERR_NO_MEMORY;\n }\n \n /**\n@@ -95,7 +95,7 @@ enum iavf_status iavf_free_dma_mem_d(struct iavf_hw *hw,\n \tstruct iavf_adapter *adapter = (struct iavf_adapter *)hw->back;\n \n \tif (!mem || !mem->va)\n-\t\treturn I40E_ERR_PARAM;\n+\t\treturn IAVF_ERR_PARAM;\n \tdma_free_coherent(&adapter->pdev->dev, mem->size,\n \t\t\t mem->va, (dma_addr_t)mem->pa);\n \treturn 0;\n@@ -111,7 +111,7 @@ enum iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw,\n \t\t\t\t\t struct iavf_virt_mem *mem, u32 size)\n {\n \tif (!mem)\n-\t\treturn I40E_ERR_PARAM;\n+\t\treturn IAVF_ERR_PARAM;\n \n \tmem->size = size;\n \tmem->va = kzalloc(size, GFP_KERNEL);\n@@ -119,7 +119,7 @@ enum iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw,\n \tif (mem->va)\n \t\treturn 0;\n \telse\n-\t\treturn I40E_ERR_NO_MEMORY;\n+\t\treturn IAVF_ERR_NO_MEMORY;\n }\n \n /**\n@@ -131,7 +131,7 @@ enum iavf_status iavf_free_virt_mem_d(struct iavf_hw *hw,\n \t\t\t\t struct iavf_virt_mem *mem)\n {\n \tif (!mem)\n-\t\treturn I40E_ERR_PARAM;\n+\t\treturn IAVF_ERR_PARAM;\n \n \t/* it's ok to kfree a NULL pointer */\n \tkfree(mem->va);\n@@ -2510,7 +2510,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t\t} else {\n \t\t\t\tdev_err(&adapter->pdev->dev, \"Bad ether dest mask %pM\\n\",\n \t\t\t\t\tmatch.mask->dst);\n-\t\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\t\treturn IAVF_ERR_CONFIG;\n \t\t\t}\n \t\t}\n \n@@ -2520,7 +2520,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t\t} else {\n \t\t\t\tdev_err(&adapter->pdev->dev, \"Bad ether src mask %pM\\n\",\n \t\t\t\t\tmatch.mask->src);\n-\t\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\t\treturn IAVF_ERR_CONFIG;\n \t\t\t}\n \t\t}\n \n@@ -2555,7 +2555,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t\t} else {\n \t\t\t\tdev_err(&adapter->pdev->dev, \"Bad vlan mask %u\\n\",\n \t\t\t\t\tmatch.mask->vlan_id);\n-\t\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\t\treturn IAVF_ERR_CONFIG;\n \t\t\t}\n \t\t}\n \t\tvf->mask.tcp_spec.vlan_id |= cpu_to_be16(0xffff);\n@@ -2579,7 +2579,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t\t} else {\n \t\t\t\tdev_err(&adapter->pdev->dev, \"Bad ip dst mask 0x%08x\\n\",\n \t\t\t\t\tbe32_to_cpu(match.mask->dst));\n-\t\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\t\treturn IAVF_ERR_CONFIG;\n \t\t\t}\n \t\t}\n \n@@ -2589,13 +2589,13 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t\t} else {\n \t\t\t\tdev_err(&adapter->pdev->dev, \"Bad ip src mask 0x%08x\\n\",\n \t\t\t\t\tbe32_to_cpu(match.mask->dst));\n-\t\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\t\treturn IAVF_ERR_CONFIG;\n \t\t\t}\n \t\t}\n \n \t\tif (field_flags & IAVF_CLOUD_FIELD_TEN_ID) {\n \t\t\tdev_info(&adapter->pdev->dev, \"Tenant id not allowed for ip filter\\n\");\n-\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\treturn IAVF_ERR_CONFIG;\n \t\t}\n \t\tif (match.key->dst) {\n \t\t\tvf->mask.tcp_spec.dst_ip[0] |= cpu_to_be32(0xffffffff);\n@@ -2616,7 +2616,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\tif (ipv6_addr_any(&match.mask->dst)) {\n \t\t\tdev_err(&adapter->pdev->dev, \"Bad ipv6 dst mask 0x%02x\\n\",\n \t\t\t\tIPV6_ADDR_ANY);\n-\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\treturn IAVF_ERR_CONFIG;\n \t\t}\n \n \t\t/* src and dest IPv6 address should not be LOOPBACK\n@@ -2626,7 +2626,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t ipv6_addr_loopback(&match.key->src)) {\n \t\t\tdev_err(&adapter->pdev->dev,\n \t\t\t\t\"ipv6 addr should not be loopback\\n\");\n-\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\treturn IAVF_ERR_CONFIG;\n \t\t}\n \t\tif (!ipv6_addr_any(&match.mask->dst) ||\n \t\t !ipv6_addr_any(&match.mask->src))\n@@ -2651,7 +2651,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t\t} else {\n \t\t\t\tdev_err(&adapter->pdev->dev, \"Bad src port mask %u\\n\",\n \t\t\t\t\tbe16_to_cpu(match.mask->src));\n-\t\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\t\treturn IAVF_ERR_CONFIG;\n \t\t\t}\n \t\t}\n \n@@ -2661,7 +2661,7 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter,\n \t\t\t} else {\n \t\t\t\tdev_err(&adapter->pdev->dev, \"Bad dst port mask %u\\n\",\n \t\t\t\t\tbe16_to_cpu(match.mask->dst));\n-\t\t\t\treturn I40E_ERR_CONFIG;\n+\t\t\t\treturn IAVF_ERR_CONFIG;\n \t\t\t}\n \t\t}\n \t\tif (match.key->dst) {\n@@ -3404,7 +3404,7 @@ static void iavf_init_task(struct work_struct *work)\n \t\t/* aq msg sent, awaiting reply */\n \t\terr = iavf_verify_api_ver(adapter);\n \t\tif (err) {\n-\t\t\tif (err == I40E_ERR_ADMIN_QUEUE_NO_WORK)\n+\t\t\tif (err == IAVF_ERR_ADMIN_QUEUE_NO_WORK)\n \t\t\t\terr = iavf_send_api_ver(adapter);\n \t\t\telse\n \t\t\t\tdev_err(&pdev->dev, \"Unsupported PF API version %d.%d, expected %d.%d\\n\",\n@@ -3432,10 +3432,10 @@ static void iavf_init_task(struct work_struct *work)\n \t\t\t\tgoto err;\n \t\t}\n \t\terr = iavf_get_vf_config(adapter);\n-\t\tif (err == I40E_ERR_ADMIN_QUEUE_NO_WORK) {\n+\t\tif (err == IAVF_ERR_ADMIN_QUEUE_NO_WORK) {\n \t\t\terr = iavf_send_vf_config_msg(adapter);\n \t\t\tgoto err;\n-\t\t} else if (err == I40E_ERR_PARAM) {\n+\t\t} else if (err == IAVF_ERR_PARAM) {\n \t\t\t/* We only get ERR_PARAM if the device is in a very bad\n \t\t\t * state or if we've been disabled for previous bad\n \t\t\t * behavior. Either way, we're done now.\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_status.h b/drivers/net/ethernet/intel/iavf/iavf_status.h\nindex 95026298685d..46e3d1f6b604 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_status.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_status.h\n@@ -6,73 +6,73 @@\n \n /* Error Codes */\n enum iavf_status {\n-\tI40E_SUCCESS\t\t\t\t= 0,\n-\tI40E_ERR_NVM\t\t\t\t= -1,\n-\tI40E_ERR_NVM_CHECKSUM\t\t\t= -2,\n-\tI40E_ERR_PHY\t\t\t\t= -3,\n-\tI40E_ERR_CONFIG\t\t\t\t= -4,\n-\tI40E_ERR_PARAM\t\t\t\t= -5,\n-\tI40E_ERR_MAC_TYPE\t\t\t= -6,\n-\tI40E_ERR_UNKNOWN_PHY\t\t\t= -7,\n-\tI40E_ERR_LINK_SETUP\t\t\t= -8,\n-\tI40E_ERR_ADAPTER_STOPPED\t\t= -9,\n-\tI40E_ERR_INVALID_MAC_ADDR\t\t= -10,\n-\tI40E_ERR_DEVICE_NOT_SUPPORTED\t\t= -11,\n-\tI40E_ERR_MASTER_REQUESTS_PENDING\t= -12,\n-\tI40E_ERR_INVALID_LINK_SETTINGS\t\t= -13,\n-\tI40E_ERR_AUTONEG_NOT_COMPLETE\t\t= -14,\n-\tI40E_ERR_RESET_FAILED\t\t\t= -15,\n-\tI40E_ERR_SWFW_SYNC\t\t\t= -16,\n-\tI40E_ERR_NO_AVAILABLE_VSI\t\t= -17,\n-\tI40E_ERR_NO_MEMORY\t\t\t= -18,\n-\tI40E_ERR_BAD_PTR\t\t\t= -19,\n-\tI40E_ERR_RING_FULL\t\t\t= -20,\n-\tI40E_ERR_INVALID_PD_ID\t\t\t= -21,\n-\tI40E_ERR_INVALID_QP_ID\t\t\t= -22,\n-\tI40E_ERR_INVALID_CQ_ID\t\t\t= -23,\n-\tI40E_ERR_INVALID_CEQ_ID\t\t\t= -24,\n-\tI40E_ERR_INVALID_AEQ_ID\t\t\t= -25,\n-\tI40E_ERR_INVALID_SIZE\t\t\t= -26,\n-\tI40E_ERR_INVALID_ARP_INDEX\t\t= -27,\n-\tI40E_ERR_INVALID_FPM_FUNC_ID\t\t= -28,\n-\tI40E_ERR_QP_INVALID_MSG_SIZE\t\t= -29,\n-\tI40E_ERR_QP_TOOMANY_WRS_POSTED\t\t= -30,\n-\tI40E_ERR_INVALID_FRAG_COUNT\t\t= -31,\n-\tI40E_ERR_QUEUE_EMPTY\t\t\t= -32,\n-\tI40E_ERR_INVALID_ALIGNMENT\t\t= -33,\n-\tI40E_ERR_FLUSHED_QUEUE\t\t\t= -34,\n-\tI40E_ERR_INVALID_PUSH_PAGE_INDEX\t= -35,\n-\tI40E_ERR_INVALID_IMM_DATA_SIZE\t\t= -36,\n-\tI40E_ERR_TIMEOUT\t\t\t= -37,\n-\tI40E_ERR_OPCODE_MISMATCH\t\t= -38,\n-\tI40E_ERR_CQP_COMPL_ERROR\t\t= -39,\n-\tI40E_ERR_INVALID_VF_ID\t\t\t= -40,\n-\tI40E_ERR_INVALID_HMCFN_ID\t\t= -41,\n-\tI40E_ERR_BACKING_PAGE_ERROR\t\t= -42,\n-\tI40E_ERR_NO_PBLCHUNKS_AVAILABLE\t\t= -43,\n-\tI40E_ERR_INVALID_PBLE_INDEX\t\t= -44,\n-\tI40E_ERR_INVALID_SD_INDEX\t\t= -45,\n-\tI40E_ERR_INVALID_PAGE_DESC_INDEX\t= -46,\n-\tI40E_ERR_INVALID_SD_TYPE\t\t= -47,\n-\tI40E_ERR_MEMCPY_FAILED\t\t\t= -48,\n-\tI40E_ERR_INVALID_HMC_OBJ_INDEX\t\t= -49,\n-\tI40E_ERR_INVALID_HMC_OBJ_COUNT\t\t= -50,\n-\tI40E_ERR_INVALID_SRQ_ARM_LIMIT\t\t= -51,\n-\tI40E_ERR_SRQ_ENABLED\t\t\t= -52,\n-\tI40E_ERR_ADMIN_QUEUE_ERROR\t\t= -53,\n-\tI40E_ERR_ADMIN_QUEUE_TIMEOUT\t\t= -54,\n-\tI40E_ERR_BUF_TOO_SHORT\t\t\t= -55,\n-\tI40E_ERR_ADMIN_QUEUE_FULL\t\t= -56,\n-\tI40E_ERR_ADMIN_QUEUE_NO_WORK\t\t= -57,\n-\tI40E_ERR_BAD_IWARP_CQE\t\t\t= -58,\n-\tI40E_ERR_NVM_BLANK_MODE\t\t\t= -59,\n-\tI40E_ERR_NOT_IMPLEMENTED\t\t= -60,\n-\tI40E_ERR_PE_DOORBELL_NOT_ENABLED\t= -61,\n-\tI40E_ERR_DIAG_TEST_FAILED\t\t= -62,\n-\tI40E_ERR_NOT_READY\t\t\t= -63,\n-\tI40E_NOT_SUPPORTED\t\t\t= -64,\n-\tI40E_ERR_FIRMWARE_API_VERSION\t\t= -65,\n-\tI40E_ERR_ADMIN_QUEUE_CRITICAL_ERROR\t= -66,\n+\tIAVF_SUCCESS\t\t\t\t= 0,\n+\tIAVF_ERR_NVM\t\t\t\t= -1,\n+\tIAVF_ERR_NVM_CHECKSUM\t\t\t= -2,\n+\tIAVF_ERR_PHY\t\t\t\t= -3,\n+\tIAVF_ERR_CONFIG\t\t\t\t= -4,\n+\tIAVF_ERR_PARAM\t\t\t\t= -5,\n+\tIAVF_ERR_MAC_TYPE\t\t\t= -6,\n+\tIAVF_ERR_UNKNOWN_PHY\t\t\t= -7,\n+\tIAVF_ERR_LINK_SETUP\t\t\t= -8,\n+\tIAVF_ERR_ADAPTER_STOPPED\t\t= -9,\n+\tIAVF_ERR_INVALID_MAC_ADDR\t\t= -10,\n+\tIAVF_ERR_DEVICE_NOT_SUPPORTED\t\t= -11,\n+\tIAVF_ERR_MASTER_REQUESTS_PENDING\t= -12,\n+\tIAVF_ERR_INVALID_LINK_SETTINGS\t\t= -13,\n+\tIAVF_ERR_AUTONEG_NOT_COMPLETE\t\t= -14,\n+\tIAVF_ERR_RESET_FAILED\t\t\t= -15,\n+\tIAVF_ERR_SWFW_SYNC\t\t\t= -16,\n+\tIAVF_ERR_NO_AVAILABLE_VSI\t\t= -17,\n+\tIAVF_ERR_NO_MEMORY\t\t\t= -18,\n+\tIAVF_ERR_BAD_PTR\t\t\t= -19,\n+\tIAVF_ERR_RING_FULL\t\t\t= -20,\n+\tIAVF_ERR_INVALID_PD_ID\t\t\t= -21,\n+\tIAVF_ERR_INVALID_QP_ID\t\t\t= -22,\n+\tIAVF_ERR_INVALID_CQ_ID\t\t\t= -23,\n+\tIAVF_ERR_INVALID_CEQ_ID\t\t\t= -24,\n+\tIAVF_ERR_INVALID_AEQ_ID\t\t\t= -25,\n+\tIAVF_ERR_INVALID_SIZE\t\t\t= -26,\n+\tIAVF_ERR_INVALID_ARP_INDEX\t\t= -27,\n+\tIAVF_ERR_INVALID_FPM_FUNC_ID\t\t= -28,\n+\tIAVF_ERR_QP_INVALID_MSG_SIZE\t\t= -29,\n+\tIAVF_ERR_QP_TOOMANY_WRS_POSTED\t\t= -30,\n+\tIAVF_ERR_INVALID_FRAG_COUNT\t\t= -31,\n+\tIAVF_ERR_QUEUE_EMPTY\t\t\t= -32,\n+\tIAVF_ERR_INVALID_ALIGNMENT\t\t= -33,\n+\tIAVF_ERR_FLUSHED_QUEUE\t\t\t= -34,\n+\tIAVF_ERR_INVALID_PUSH_PAGE_INDEX\t= -35,\n+\tIAVF_ERR_INVALID_IMM_DATA_SIZE\t\t= -36,\n+\tIAVF_ERR_TIMEOUT\t\t\t= -37,\n+\tIAVF_ERR_OPCODE_MISMATCH\t\t= -38,\n+\tIAVF_ERR_CQP_COMPL_ERROR\t\t= -39,\n+\tIAVF_ERR_INVALID_VF_ID\t\t\t= -40,\n+\tIAVF_ERR_INVALID_HMCFN_ID\t\t= -41,\n+\tIAVF_ERR_BACKING_PAGE_ERROR\t\t= -42,\n+\tIAVF_ERR_NO_PBLCHUNKS_AVAILABLE\t\t= -43,\n+\tIAVF_ERR_INVALID_PBLE_INDEX\t\t= -44,\n+\tIAVF_ERR_INVALID_SD_INDEX\t\t= -45,\n+\tIAVF_ERR_INVALID_PAGE_DESC_INDEX\t= -46,\n+\tIAVF_ERR_INVALID_SD_TYPE\t\t= -47,\n+\tIAVF_ERR_MEMCPY_FAILED\t\t\t= -48,\n+\tIAVF_ERR_INVALID_HMC_OBJ_INDEX\t\t= -49,\n+\tIAVF_ERR_INVALID_HMC_OBJ_COUNT\t\t= -50,\n+\tIAVF_ERR_INVALID_SRQ_ARM_LIMIT\t\t= -51,\n+\tIAVF_ERR_SRQ_ENABLED\t\t\t= -52,\n+\tIAVF_ERR_ADMIN_QUEUE_ERROR\t\t= -53,\n+\tIAVF_ERR_ADMIN_QUEUE_TIMEOUT\t\t= -54,\n+\tIAVF_ERR_BUF_TOO_SHORT\t\t\t= -55,\n+\tIAVF_ERR_ADMIN_QUEUE_FULL\t\t= -56,\n+\tIAVF_ERR_ADMIN_QUEUE_NO_WORK\t\t= -57,\n+\tIAVF_ERR_BAD_IWARP_CQE\t\t\t= -58,\n+\tIAVF_ERR_NVM_BLANK_MODE\t\t\t= -59,\n+\tIAVF_ERR_NOT_IMPLEMENTED\t\t= -60,\n+\tIAVF_ERR_PE_DOORBELL_NOT_ENABLED\t= -61,\n+\tIAVF_ERR_DIAG_TEST_FAILED\t\t= -62,\n+\tIAVF_ERR_NOT_READY\t\t\t= -63,\n+\tIAVF_NOT_SUPPORTED\t\t\t= -64,\n+\tIAVF_ERR_FIRMWARE_API_VERSION\t\t= -65,\n+\tIAVF_ERR_ADMIN_QUEUE_CRITICAL_ERROR\t= -66,\n };\n \n #endif /* _IAVF_STATUS_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex 47df277e12d7..b9f73154dcee 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -60,7 +60,7 @@ int iavf_send_api_ver(struct iavf_adapter *adapter)\n *\n * Compare API versions with the PF. Must be called after admin queue is\n * initialized. Returns 0 if API versions match, -EIO if they do not,\n- * I40E_ERR_ADMIN_QUEUE_NO_WORK if the admin queue is empty, and any errors\n+ * IAVF_ERR_ADMIN_QUEUE_NO_WORK if the admin queue is empty, and any errors\n * from the firmware are propagated.\n **/\n int iavf_verify_api_ver(struct iavf_adapter *adapter)\n", "prefixes": [ "next", "S4", "iavf", "5/9" ] }