Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/750542/?format=api
{ "id": 750542, "url": "http://patchwork.ozlabs.org/api/patches/750542/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170413084555.6962-11-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": "<20170413084555.6962-11-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-04-13T08:45:54", "name": "[next,S70,11/12] i40e: properly spell I40E_VF_STATE_* flags", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0c98045ad0a712fc3450717655e0d0289f3623be", "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/20170413084555.6962-11-alice.michael@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/750542/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/750542/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3w3mvj42LNz9s8Q\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 14 Apr 2017 02:48:49 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 29AF58A680;\n\tThu, 13 Apr 2017 16:48:48 +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 bMAorIS8PcYP; Thu, 13 Apr 2017 16:48:43 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B1D778A6A9;\n\tThu, 13 Apr 2017 16:48:38 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id BA8101BFE90\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:34 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B0E6783167\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:34 +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 E1imv8XJSrxH for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:32 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id B8F76889F7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 13 Apr 2017 16:48:32 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t13 Apr 2017 09:48:29 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby orsmga002.jf.intel.com with ESMTP; 13 Apr 2017 09:48:29 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.37,195,1488873600\"; d=\"scan'208\";a=\"73711340\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Thu, 13 Apr 2017 04:45:54 -0400", "Message-Id": "<20170413084555.6962-11-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170413084555.6962-1-alice.michael@intel.com>", "References": "<20170413084555.6962-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S70 11/12] i40e: properly spell\n\tI40E_VF_STATE_* flags", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "From: Jacob Keller <jacob.e.keller@intel.com>\n\nThese flags represent the state of the VF at various times. Do not\nspell them as _STAT_ which can be confusing to readers who may think\nthese refer to statistics.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: I6bc092cd472e8276896a1fd7498aced2084312df\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 98 +++++++++++-----------\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 14 ++--\n 4 files changed, 58 insertions(+), 58 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 08035c4..523dd81 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1826,7 +1826,7 @@ static inline bool i40e_active_vfs(struct i40e_pf *pf)\n \tint i;\n \n \tfor (i = 0; i < pf->num_alloc_vfs; i++)\n-\t\tif (test_bit(I40E_VF_STAT_ACTIVE, &vfs[i].vf_states))\n+\t\tif (test_bit(I40E_VF_STATE_ACTIVE, &vfs[i].vf_states))\n \t\t\treturn true;\n \treturn false;\n }\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex b9d7798..5d17a52 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -7361,7 +7361,7 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)\n \t\t\t\t \"Too many MDD events on VF %d, disabled\\n\", i);\n \t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t \"Use PF Control I/F to re-enable the VF\\n\");\n-\t\t\tset_bit(I40E_VF_STAT_DISABLED, &vf->vf_states);\n+\t\t\tset_bit(I40E_VF_STATE_DISABLED, &vf->vf_states);\n \t\t}\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex 423068a..b97f9f2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -50,8 +50,8 @@ static void i40e_vc_vf_broadcast(struct i40e_pf *pf,\n \tfor (i = 0; i < pf->num_alloc_vfs; i++, vf++) {\n \t\tint abs_vf_id = vf->vf_id + (int)hw->func_caps.vf_base_id;\n \t\t/* Not all vfs are enabled so skip the ones that are not */\n-\t\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states) &&\n-\t\t !test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states))\n+\t\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states) &&\n+\t\t !test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states))\n \t\t\tcontinue;\n \n \t\t/* Ignore return value on purpose - a given VF may fail, but\n@@ -137,8 +137,8 @@ void i40e_vc_notify_vf_reset(struct i40e_vf *vf)\n \t\treturn;\n \n \t/* verify if the VF is in either init or active before proceeding */\n-\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states) &&\n-\t !test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states))\n+\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states) &&\n+\t !test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states))\n \t\treturn;\n \n \tabs_vf_id = vf->vf_id + (int)vf->pf->hw.func_caps.vf_base_id;\n@@ -812,7 +812,7 @@ static void i40e_free_vf_res(struct i40e_vf *vf)\n \t/* Start by disabling VF's configuration API to prevent the OS from\n \t * accessing the VF's VSI after it's freed / invalidated.\n \t */\n-\tclear_bit(I40E_VF_STAT_INIT, &vf->vf_states);\n+\tclear_bit(I40E_VF_STATE_INIT, &vf->vf_states);\n \n \t/* free vsi & disconnect it from the parent uplink */\n \tif (vf->lan_vsi_idx) {\n@@ -884,7 +884,7 @@ static int i40e_alloc_vf_res(struct i40e_vf *vf)\n \tvf->num_queue_pairs = total_queue_pairs;\n \n \t/* VF is now completely initialized */\n-\tset_bit(I40E_VF_STAT_INIT, &vf->vf_states);\n+\tset_bit(I40E_VF_STATE_INIT, &vf->vf_states);\n \n error_alloc:\n \tif (ret)\n@@ -938,7 +938,7 @@ static void i40e_trigger_vf_reset(struct i40e_vf *vf, bool flr)\n \tu32 reg, reg_idx, bit_idx;\n \n \t/* warn the VF */\n-\tclear_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);\n+\tclear_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states);\n \n \t/* Disable VF's configuration API during reset. The flag is re-enabled\n \t * in i40e_alloc_vf_res(), when it's safe again to access VF's VSI.\n@@ -946,7 +946,7 @@ static void i40e_trigger_vf_reset(struct i40e_vf *vf, bool flr)\n \t * to do it earlier to give some time to finish to any VF config\n \t * functions that may still be running at this point.\n \t */\n-\tclear_bit(I40E_VF_STAT_INIT, &vf->vf_states);\n+\tclear_bit(I40E_VF_STATE_INIT, &vf->vf_states);\n \n \t/* In the case of a VFLR, the HW has already reset the VF and we\n \t * just need to clean up, so don't hit the VFRTRIG register.\n@@ -1004,8 +1004,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf)\n \tif (!i40e_alloc_vf_res(vf)) {\n \t\tint abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;\n \t\ti40e_enable_vf_mappings(vf);\n-\t\tset_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);\n-\t\tclear_bit(I40E_VF_STAT_DISABLED, &vf->vf_states);\n+\t\tset_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states);\n+\t\tclear_bit(I40E_VF_STATE_DISABLED, &vf->vf_states);\n \t\t/* Do not notify the client during VF init */\n \t\tif (vf->pf->num_alloc_vfs)\n \t\t\ti40e_notify_client_of_vf_reset(pf, abs_vf_id);\n@@ -1194,7 +1194,7 @@ void i40e_free_vfs(struct i40e_pf *pf)\n \n \ti40e_notify_client_of_vf_enable(pf, 0);\n \tfor (i = 0; i < pf->num_alloc_vfs; i++)\n-\t\tif (test_bit(I40E_VF_STAT_INIT, &pf->vf[i].vf_states))\n+\t\tif (test_bit(I40E_VF_STATE_INIT, &pf->vf[i].vf_states))\n \t\t\ti40e_vsi_stop_rings(pf->vsi[pf->vf[i].lan_vsi_idx]);\n \n \t/* Disable IOV before freeing resources. This lets any VF drivers\n@@ -1212,7 +1212,7 @@ void i40e_free_vfs(struct i40e_pf *pf)\n \ttmp = pf->num_alloc_vfs;\n \tpf->num_alloc_vfs = 0;\n \tfor (i = 0; i < tmp; i++) {\n-\t\tif (test_bit(I40E_VF_STAT_INIT, &pf->vf[i].vf_states))\n+\t\tif (test_bit(I40E_VF_STATE_INIT, &pf->vf[i].vf_states))\n \t\t\ti40e_free_vf_res(&pf->vf[i]);\n \t\t/* disable qp mappings */\n \t\ti40e_disable_vf_mappings(&pf->vf[i]);\n@@ -1427,7 +1427,7 @@ static int i40e_vc_send_msg_to_vf(struct i40e_vf *vf, u32 v_opcode,\n \t\t\t\t\"Number of invalid messages exceeded for VF %d\\n\",\n \t\t\t\tvf->vf_id);\n \t\t\tdev_err(&pf->pdev->dev, \"Use PF Control I/F to enable the VF\\n\");\n-\t\t\tset_bit(I40E_VF_STAT_DISABLED, &vf->vf_states);\n+\t\t\tset_bit(I40E_VF_STATE_DISABLED, &vf->vf_states);\n \t\t}\n \t} else {\n \t\tvf->num_valid_msgs++;\n@@ -1502,7 +1502,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)\n \tint len = 0;\n \tint ret;\n \n-\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto err;\n \t}\n@@ -1531,7 +1531,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)\n \tif (i40e_vf_client_capable(pf, vf->vf_id) &&\n \t (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_IWARP)) {\n \t\tvfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_IWARP;\n-\t\tset_bit(I40E_VF_STAT_IWARPENA, &vf->vf_states);\n+\t\tset_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states);\n \t}\n \n \tif (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF) {\n@@ -1592,7 +1592,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)\n \t\tether_addr_copy(vfres->vsi_res[0].default_mac_addr,\n \t\t\t\tvf->default_lan_addr.addr);\n \t}\n-\tset_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);\n+\tset_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states);\n \n err:\n \t/* send the response back to the VF */\n@@ -1615,7 +1615,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)\n **/\n static void i40e_vc_reset_vf_msg(struct i40e_vf *vf)\n {\n-\tif (test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states))\n+\tif (test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states))\n \t\ti40e_reset_vf(vf, false);\n }\n \n@@ -1663,7 +1663,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,\n \tint bkt;\n \n \tvsi = i40e_find_vsi_from_id(pf, info->vsi_id);\n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n \t !i40e_vc_isvalid_vsi_id(vf, info->vsi_id) ||\n \t !vsi) {\n \t\taq_ret = I40E_ERR_PARAM;\n@@ -1724,9 +1724,9 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,\n \t\t\t \"VF %d successfully set multicast promiscuous mode\\n\",\n \t\t\t vf->vf_id);\n \t\tif (allmulti)\n-\t\t\tset_bit(I40E_VF_STAT_MC_PROMISC, &vf->vf_states);\n+\t\t\tset_bit(I40E_VF_STATE_MC_PROMISC, &vf->vf_states);\n \t\telse\n-\t\t\tclear_bit(I40E_VF_STAT_MC_PROMISC, &vf->vf_states);\n+\t\t\tclear_bit(I40E_VF_STATE_MC_PROMISC, &vf->vf_states);\n \t}\n \n \tif (info->flags & I40E_FLAG_VF_UNICAST_PROMISC)\n@@ -1775,9 +1775,9 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,\n \t\t\t \"VF %d successfully set unicast promiscuous mode\\n\",\n \t\t\t vf->vf_id);\n \t\tif (alluni)\n-\t\t\tset_bit(I40E_VF_STAT_UC_PROMISC, &vf->vf_states);\n+\t\t\tset_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states);\n \t\telse\n-\t\t\tclear_bit(I40E_VF_STAT_UC_PROMISC, &vf->vf_states);\n+\t\t\tclear_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states);\n \t}\n \n error_param:\n@@ -1806,7 +1806,7 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status aq_ret = 0;\n \tint i;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -1863,7 +1863,7 @@ static int i40e_vc_config_irq_map_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tunsigned long tempmap;\n \tint i;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -1923,7 +1923,7 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tu16 vsi_id = vqs->vsi_id;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -1968,7 +1968,7 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tstruct i40e_pf *pf = vf->pf;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -2015,7 +2015,7 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \n \tmemset(&stats, 0, sizeof(struct i40e_eth_stats));\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -2102,7 +2102,7 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status ret = 0;\n \tint i;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n \t\tret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n@@ -2171,7 +2171,7 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status ret = 0;\n \tint i;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n \t\tret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n@@ -2237,7 +2237,7 @@ static int i40e_vc_add_vlan_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \t\t\t\"VF is not trusted, switch the VF to trusted to add more VLAN addresses\\n\");\n \t\tgoto error_param;\n \t}\n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n@@ -2264,12 +2264,12 @@ static int i40e_vc_add_vlan_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \t\tif (!ret)\n \t\t\tvf->num_vlan++;\n \n-\t\tif (test_bit(I40E_VF_STAT_UC_PROMISC, &vf->vf_states))\n+\t\tif (test_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states))\n \t\t\ti40e_aq_set_vsi_uc_promisc_on_vlan(&pf->hw, vsi->seid,\n \t\t\t\t\t\t\t true,\n \t\t\t\t\t\t\t vfl->vlan_id[i],\n \t\t\t\t\t\t\t NULL);\n-\t\tif (test_bit(I40E_VF_STAT_MC_PROMISC, &vf->vf_states))\n+\t\tif (test_bit(I40E_VF_STATE_MC_PROMISC, &vf->vf_states))\n \t\t\ti40e_aq_set_vsi_mc_promisc_on_vlan(&pf->hw, vsi->seid,\n \t\t\t\t\t\t\t true,\n \t\t\t\t\t\t\t vfl->vlan_id[i],\n@@ -2304,7 +2304,7 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status aq_ret = 0;\n \tint i;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n@@ -2327,12 +2327,12 @@ static int i40e_vc_remove_vlan_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \t\ti40e_vsi_kill_vlan(vsi, vfl->vlan_id[i]);\n \t\tvf->num_vlan--;\n \n-\t\tif (test_bit(I40E_VF_STAT_UC_PROMISC, &vf->vf_states))\n+\t\tif (test_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states))\n \t\t\ti40e_aq_set_vsi_uc_promisc_on_vlan(&pf->hw, vsi->seid,\n \t\t\t\t\t\t\t false,\n \t\t\t\t\t\t\t vfl->vlan_id[i],\n \t\t\t\t\t\t\t NULL);\n-\t\tif (test_bit(I40E_VF_STAT_MC_PROMISC, &vf->vf_states))\n+\t\tif (test_bit(I40E_VF_STATE_MC_PROMISC, &vf->vf_states))\n \t\t\ti40e_aq_set_vsi_mc_promisc_on_vlan(&pf->hw, vsi->seid,\n \t\t\t\t\t\t\t false,\n \t\t\t\t\t\t\t vfl->vlan_id[i],\n@@ -2358,8 +2358,8 @@ static int i40e_vc_iwarp_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tint abs_vf_id = vf->vf_id + pf->hw.func_caps.vf_base_id;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VF_STAT_IWARPENA, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n+\t !test_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -2389,8 +2389,8 @@ static int i40e_vc_iwarp_qvmap_msg(struct i40e_vf *vf, u8 *msg, u16 msglen,\n \t\t\t\t(struct i40e_virtchnl_iwarp_qvlist_info *)msg;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n-\t !test_bit(I40E_VF_STAT_IWARPENA, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n+\t !test_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -2427,7 +2427,7 @@ static int i40e_vc_config_rss_key(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tu16 vsi_id = vrk->vsi_id;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id) ||\n \t (vrk->key_len != I40E_HKEY_ARRAY_SIZE)) {\n \t\taq_ret = I40E_ERR_PARAM;\n@@ -2459,7 +2459,7 @@ static int i40e_vc_config_rss_lut(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tu16 vsi_id = vrl->vsi_id;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states) ||\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states) ||\n \t !i40e_vc_isvalid_vsi_id(vf, vsi_id) ||\n \t (vrl->lut_entries != I40E_VF_HLUT_ARRAY_SIZE)) {\n \t\taq_ret = I40E_ERR_PARAM;\n@@ -2489,7 +2489,7 @@ static int i40e_vc_get_rss_hena(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \ti40e_status aq_ret = 0;\n \tint len = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto err;\n \t}\n@@ -2526,7 +2526,7 @@ static int i40e_vc_set_rss_hena(struct i40e_vf *vf, u8 *msg, u16 msglen)\n \tstruct i40e_hw *hw = &pf->hw;\n \ti40e_status aq_ret = 0;\n \n-\tif (!test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto err;\n \t}\n@@ -2556,7 +2556,7 @@ static int i40e_vc_validate_vf_msg(struct i40e_vf *vf, u32 v_opcode,\n \tint valid_len = 0;\n \n \t/* Check if VF is disabled. */\n-\tif (test_bit(I40E_VF_STAT_DISABLED, &vf->vf_states))\n+\tif (test_bit(I40E_VF_STATE_DISABLED, &vf->vf_states))\n \t\treturn I40E_ERR_PARAM;\n \n \t/* Validate message length. */\n@@ -2880,7 +2880,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \n \tvf = &(pf->vf[vf_id]);\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {\n \t\tdev_err(&pf->pdev->dev, \"VF %d still in reset. Try again.\\n\",\n \t\t\tvf_id);\n \t\tret = -EAGAIN;\n@@ -2969,7 +2969,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,\n \n \tvf = &(pf->vf[vf_id]);\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {\n \t\tdev_err(&pf->pdev->dev, \"VF %d still in reset. Try again.\\n\",\n \t\t\tvf_id);\n \t\tret = -EAGAIN;\n@@ -3101,7 +3101,7 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,\n \n \tvf = &(pf->vf[vf_id]);\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {\n \t\tdev_err(&pf->pdev->dev, \"VF %d still in reset. Try again.\\n\",\n \t\t\tvf_id);\n \t\tret = -EAGAIN;\n@@ -3182,7 +3182,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,\n \tvf = &(pf->vf[vf_id]);\n \t/* first vsi is always the LAN vsi */\n \tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {\n \t\tdev_err(&pf->pdev->dev, \"VF %d still in reset. Try again.\\n\",\n \t\t\tvf_id);\n \t\tret = -EAGAIN;\n@@ -3313,7 +3313,7 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable)\n \t}\n \n \tvf = &(pf->vf[vf_id]);\n-\tif (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {\n+\tif (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {\n \t\tdev_err(&pf->pdev->dev, \"VF %d still in reset. Try again.\\n\",\n \t\t\tvf_id);\n \t\tret = -EAGAIN;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\nindex f76d234..7ff45df 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n@@ -56,13 +56,13 @@ enum i40e_queue_ctrl {\n \n /* VF states */\n enum i40e_vf_states {\n-\tI40E_VF_STAT_INIT = 0,\n-\tI40E_VF_STAT_ACTIVE,\n-\tI40E_VF_STAT_IWARPENA,\n-\tI40E_VF_STAT_FCOEENA,\n-\tI40E_VF_STAT_DISABLED,\n-\tI40E_VF_STAT_MC_PROMISC,\n-\tI40E_VF_STAT_UC_PROMISC,\n+\tI40E_VF_STATE_INIT = 0,\n+\tI40E_VF_STATE_ACTIVE,\n+\tI40E_VF_STATE_IWARPENA,\n+\tI40E_VF_STATE_FCOEENA,\n+\tI40E_VF_STATE_DISABLED,\n+\tI40E_VF_STATE_MC_PROMISC,\n+\tI40E_VF_STATE_UC_PROMISC,\n };\n \n /* VF capabilities */\n", "prefixes": [ "next", "S70", "11/12" ] }