Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1087276/?format=api
{ "id": 1087276, "url": "http://patchwork.ozlabs.org/api/patches/1087276/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190417221737.11460-6-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-6-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-04-17T22:17:34", "name": "[next,S4,iavf,6/9] iavf: rename iavf_client.h defines to match driver name", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ff6e2283dad93c1cd96d646d14febb2ed8ebcf8e", "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-6-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/1087276/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1087276/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 44kxW107vpz9s3Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 18 Apr 2019 08:19:56 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5FD90861C9;\n\tWed, 17 Apr 2019 22:19:55 +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 GzyXawefT60c; Wed, 17 Apr 2019 22:19:53 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B8324861D7;\n\tWed, 17 Apr 2019 22:19:53 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5920E1BF405\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:52 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 536EA2EE62\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:52 +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 hZn6+smcQT6o 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 19FD02ECA9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:42 +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=\"136697251\"", "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:34 -0700", "Message-Id": "<20190417221737.11460-6-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 6/9] iavf: rename\n\tiavf_client.h defines to match driver name", "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": "The defines in iavf_client.h were still vastly i40e, and they\nshould be iavf.\n\nSigned-off-by: Alice Michael <alice.michael@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_client.c | 84 +++++++-------\n drivers/net/ethernet/intel/iavf/iavf_client.h | 104 +++++++++---------\n 3 files changed, 95 insertions(+), 95 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 42118f63f4f0..5a537d57a531 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -244,7 +244,7 @@ struct iavf_adapter {\n \tint num_iwarp_msix;\n \tint iwarp_base_vector;\n \tu32 client_pending;\n-\tstruct i40e_client_instance *cinst;\n+\tstruct iavf_client_instance *cinst;\n \tstruct msix_entry *msix_entries;\n \n \tu32 flags;\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_client.c b/drivers/net/ethernet/intel/iavf/iavf_client.c\nindex 196ce7324ea4..079a22849fcb 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_client.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_client.c\n@@ -10,19 +10,19 @@\n \n static\n const char iavf_client_interface_version_str[] = IAVF_CLIENT_VERSION_STR;\n-static struct i40e_client *vf_registered_client;\n+static struct iavf_client *vf_registered_client;\n static LIST_HEAD(i40e_devices);\n static DEFINE_MUTEX(iavf_device_mutex);\n \n-static u32 iavf_client_virtchnl_send(struct i40e_info *ldev,\n-\t\t\t\t struct i40e_client *client,\n+static u32 iavf_client_virtchnl_send(struct iavf_info *ldev,\n+\t\t\t\t struct iavf_client *client,\n \t\t\t\t u8 *msg, u16 len);\n \n-static int iavf_client_setup_qvlist(struct i40e_info *ldev,\n-\t\t\t\t struct i40e_client *client,\n-\t\t\t\t struct i40e_qvlist_info *qvlist_info);\n+static int iavf_client_setup_qvlist(struct iavf_info *ldev,\n+\t\t\t\t struct iavf_client *client,\n+\t\t\t\t struct iavf_qvlist_info *qvlist_info);\n \n-static struct i40e_ops iavf_lan_ops = {\n+static struct iavf_ops iavf_lan_ops = {\n \t.virtchnl_send = iavf_client_virtchnl_send,\n \t.setup_qvlist = iavf_client_setup_qvlist,\n };\n@@ -33,11 +33,11 @@ static struct i40e_ops iavf_lan_ops = {\n * @params: client param struct\n **/\n static\n-void iavf_client_get_params(struct iavf_vsi *vsi, struct i40e_params *params)\n+void iavf_client_get_params(struct iavf_vsi *vsi, struct iavf_params *params)\n {\n \tint i;\n \n-\tmemset(params, 0, sizeof(struct i40e_params));\n+\tmemset(params, 0, sizeof(struct iavf_params));\n \tparams->mtu = vsi->netdev->mtu;\n \tparams->link_up = vsi->back->link_up;\n \n@@ -57,7 +57,7 @@ void iavf_client_get_params(struct iavf_vsi *vsi, struct i40e_params *params)\n **/\n void iavf_notify_client_message(struct iavf_vsi *vsi, u8 *msg, u16 len)\n {\n-\tstruct i40e_client_instance *cinst;\n+\tstruct iavf_client_instance *cinst;\n \n \tif (!vsi)\n \t\treturn;\n@@ -81,8 +81,8 @@ void iavf_notify_client_message(struct iavf_vsi *vsi, u8 *msg, u16 len)\n **/\n void iavf_notify_client_l2_params(struct iavf_vsi *vsi)\n {\n-\tstruct i40e_client_instance *cinst;\n-\tstruct i40e_params params;\n+\tstruct iavf_client_instance *cinst;\n+\tstruct iavf_params params;\n \n \tif (!vsi)\n \t\treturn;\n@@ -110,7 +110,7 @@ void iavf_notify_client_l2_params(struct iavf_vsi *vsi)\n void iavf_notify_client_open(struct iavf_vsi *vsi)\n {\n \tstruct iavf_adapter *adapter = vsi->back;\n-\tstruct i40e_client_instance *cinst = adapter->cinst;\n+\tstruct iavf_client_instance *cinst = adapter->cinst;\n \tint ret;\n \n \tif (!cinst || !cinst->client || !cinst->client->ops ||\n@@ -119,10 +119,10 @@ void iavf_notify_client_open(struct iavf_vsi *vsi)\n \t\t\t\"Cannot locate client instance open function\\n\");\n \t\treturn;\n \t}\n-\tif (!(test_bit(__I40E_CLIENT_INSTANCE_OPENED, &cinst->state))) {\n+\tif (!(test_bit(__IAVF_CLIENT_INSTANCE_OPENED, &cinst->state))) {\n \t\tret = cinst->client->ops->open(&cinst->lan_info, cinst->client);\n \t\tif (!ret)\n-\t\t\tset_bit(__I40E_CLIENT_INSTANCE_OPENED, &cinst->state);\n+\t\t\tset_bit(__IAVF_CLIENT_INSTANCE_OPENED, &cinst->state);\n \t}\n }\n \n@@ -132,7 +132,7 @@ void iavf_notify_client_open(struct iavf_vsi *vsi)\n *\n * Return 0 on success or < 0 on error\n **/\n-static int iavf_client_release_qvlist(struct i40e_info *ldev)\n+static int iavf_client_release_qvlist(struct iavf_info *ldev)\n {\n \tstruct iavf_adapter *adapter = ldev->vf;\n \tenum iavf_status err;\n@@ -162,7 +162,7 @@ static int iavf_client_release_qvlist(struct i40e_info *ldev)\n void iavf_notify_client_close(struct iavf_vsi *vsi, bool reset)\n {\n \tstruct iavf_adapter *adapter = vsi->back;\n-\tstruct i40e_client_instance *cinst = adapter->cinst;\n+\tstruct iavf_client_instance *cinst = adapter->cinst;\n \n \tif (!cinst || !cinst->client || !cinst->client->ops ||\n \t !cinst->client->ops->close) {\n@@ -172,7 +172,7 @@ void iavf_notify_client_close(struct iavf_vsi *vsi, bool reset)\n \t}\n \tcinst->client->ops->close(&cinst->lan_info, cinst->client, reset);\n \tiavf_client_release_qvlist(&cinst->lan_info);\n-\tclear_bit(__I40E_CLIENT_INSTANCE_OPENED, &cinst->state);\n+\tclear_bit(__IAVF_CLIENT_INSTANCE_OPENED, &cinst->state);\n }\n \n /**\n@@ -181,13 +181,13 @@ void iavf_notify_client_close(struct iavf_vsi *vsi, bool reset)\n *\n * Returns cinst ptr on success, NULL on failure\n **/\n-static struct i40e_client_instance *\n+static struct iavf_client_instance *\n iavf_client_add_instance(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_client_instance *cinst = NULL;\n+\tstruct iavf_client_instance *cinst = NULL;\n \tstruct iavf_vsi *vsi = &adapter->vsi;\n \tstruct netdev_hw_addr *mac = NULL;\n-\tstruct i40e_params params;\n+\tstruct iavf_params params;\n \n \tif (!vf_registered_client)\n \t\tgoto out;\n@@ -205,7 +205,7 @@ iavf_client_add_instance(struct iavf_adapter *adapter)\n \tcinst->lan_info.netdev = vsi->netdev;\n \tcinst->lan_info.pcidev = adapter->pdev;\n \tcinst->lan_info.fid = 0;\n-\tcinst->lan_info.ftype = I40E_CLIENT_FTYPE_VF;\n+\tcinst->lan_info.ftype = IAVF_CLIENT_FTYPE_VF;\n \tcinst->lan_info.hw_addr = adapter->hw.hw_addr;\n \tcinst->lan_info.ops = &iavf_lan_ops;\n \tcinst->lan_info.version.major = IAVF_CLIENT_VERSION_MAJOR;\n@@ -213,7 +213,7 @@ iavf_client_add_instance(struct iavf_adapter *adapter)\n \tcinst->lan_info.version.build = IAVF_CLIENT_VERSION_BUILD;\n \tiavf_client_get_params(vsi, ¶ms);\n \tcinst->lan_info.params = params;\n-\tset_bit(__I40E_CLIENT_INSTANCE_NONE, &cinst->state);\n+\tset_bit(__IAVF_CLIENT_INSTANCE_NONE, &cinst->state);\n \n \tcinst->lan_info.msix_count = adapter->num_iwarp_msix;\n \tcinst->lan_info.msix_entries =\n@@ -250,8 +250,8 @@ void iavf_client_del_instance(struct iavf_adapter *adapter)\n **/\n void iavf_client_subtask(struct iavf_adapter *adapter)\n {\n-\tstruct i40e_client *client = vf_registered_client;\n-\tstruct i40e_client_instance *cinst;\n+\tstruct iavf_client *client = vf_registered_client;\n+\tstruct iavf_client_instance *cinst;\n \tint ret = 0;\n \n \tif (adapter->state < __IAVF_DOWN)\n@@ -269,13 +269,13 @@ void iavf_client_subtask(struct iavf_adapter *adapter)\n \tdev_info(&adapter->pdev->dev, \"Added instance of Client %s\\n\",\n \t\t client->name);\n \n-\tif (!test_bit(__I40E_CLIENT_INSTANCE_OPENED, &cinst->state)) {\n+\tif (!test_bit(__IAVF_CLIENT_INSTANCE_OPENED, &cinst->state)) {\n \t\t/* Send an Open request to the client */\n \n \t\tif (client->ops && client->ops->open)\n \t\t\tret = client->ops->open(&cinst->lan_info, client);\n \t\tif (!ret)\n-\t\t\tset_bit(__I40E_CLIENT_INSTANCE_OPENED,\n+\t\t\tset_bit(__IAVF_CLIENT_INSTANCE_OPENED,\n \t\t\t\t&cinst->state);\n \t\telse\n \t\t\t/* remove client instance */\n@@ -357,9 +357,9 @@ int iavf_lan_del_device(struct iavf_adapter *adapter)\n * @client: pointer to the registered client\n *\n **/\n-static void iavf_client_release(struct i40e_client *client)\n+static void iavf_client_release(struct iavf_client *client)\n {\n-\tstruct i40e_client_instance *cinst;\n+\tstruct iavf_client_instance *cinst;\n \tstruct i40e_device *ldev;\n \tstruct iavf_adapter *adapter;\n \n@@ -369,12 +369,12 @@ static void iavf_client_release(struct i40e_client *client)\n \t\tcinst = adapter->cinst;\n \t\tif (!cinst)\n \t\t\tcontinue;\n-\t\tif (test_bit(__I40E_CLIENT_INSTANCE_OPENED, &cinst->state)) {\n+\t\tif (test_bit(__IAVF_CLIENT_INSTANCE_OPENED, &cinst->state)) {\n \t\t\tif (client->ops && client->ops->close)\n \t\t\t\tclient->ops->close(&cinst->lan_info, client,\n \t\t\t\t\t\t false);\n \t\t\tiavf_client_release_qvlist(&cinst->lan_info);\n-\t\t\tclear_bit(__I40E_CLIENT_INSTANCE_OPENED, &cinst->state);\n+\t\t\tclear_bit(__IAVF_CLIENT_INSTANCE_OPENED, &cinst->state);\n \n \t\t\tdev_warn(&adapter->pdev->dev,\n \t\t\t\t \"Client %s instance closed\\n\", client->name);\n@@ -392,7 +392,7 @@ static void iavf_client_release(struct i40e_client *client)\n * @client: pointer to the registered client\n *\n **/\n-static void iavf_client_prepare(struct i40e_client *client)\n+static void iavf_client_prepare(struct iavf_client *client)\n {\n \tstruct i40e_device *ldev;\n \tstruct iavf_adapter *adapter;\n@@ -415,8 +415,8 @@ static void iavf_client_prepare(struct i40e_client *client)\n *\n * Return 0 on success or < 0 on error\n **/\n-static u32 iavf_client_virtchnl_send(struct i40e_info *ldev,\n-\t\t\t\t struct i40e_client *client,\n+static u32 iavf_client_virtchnl_send(struct iavf_info *ldev,\n+\t\t\t\t struct iavf_client *client,\n \t\t\t\t u8 *msg, u16 len)\n {\n \tstruct iavf_adapter *adapter = ldev->vf;\n@@ -442,13 +442,13 @@ static u32 iavf_client_virtchnl_send(struct i40e_info *ldev,\n *\n * Return 0 on success or < 0 on error\n **/\n-static int iavf_client_setup_qvlist(struct i40e_info *ldev,\n-\t\t\t\t struct i40e_client *client,\n-\t\t\t\t struct i40e_qvlist_info *qvlist_info)\n+static int iavf_client_setup_qvlist(struct iavf_info *ldev,\n+\t\t\t\t struct iavf_client *client,\n+\t\t\t\t struct iavf_qvlist_info *qvlist_info)\n {\n \tstruct virtchnl_iwarp_qvlist_info *v_qvlist_info;\n \tstruct iavf_adapter *adapter = ldev->vf;\n-\tstruct i40e_qv_info *qv_info;\n+\tstruct iavf_qv_info *qv_info;\n \tenum iavf_status err;\n \tu32 v_idx, i;\n \tsize_t msg_size;\n@@ -499,11 +499,11 @@ static int iavf_client_setup_qvlist(struct i40e_info *ldev,\n \n /**\n * iavf_register_client - Register a i40e client driver with the L2 driver\n- * @client: pointer to the i40e_client struct\n+ * @client: pointer to the iavf_client struct\n *\n * Returns 0 on success or non-0 on error\n **/\n-int iavf_register_client(struct i40e_client *client)\n+int iavf_register_client(struct iavf_client *client)\n {\n \tint ret = 0;\n \n@@ -550,11 +550,11 @@ EXPORT_SYMBOL(iavf_register_client);\n \n /**\n * iavf_unregister_client - Unregister a i40e client driver with the L2 driver\n- * @client: pointer to the i40e_client struct\n+ * @client: pointer to the iavf_client struct\n *\n * Returns 0 on success or non-0 on error\n **/\n-int iavf_unregister_client(struct i40e_client *client)\n+int iavf_unregister_client(struct iavf_client *client)\n {\n \tint ret = 0;\n \ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_client.h b/drivers/net/ethernet/intel/iavf/iavf_client.h\nindex e216fc9dfd81..4936ec1ba1bf 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_client.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_client.h\n@@ -17,86 +17,86 @@\n \t__stringify(IAVF_CLIENT_VERSION_MINOR) \".\" \\\n \t__stringify(IAVF_CLIENT_VERSION_BUILD)\n \n-struct i40e_client_version {\n+struct iavf_client_version {\n \tu8 major;\n \tu8 minor;\n \tu8 build;\n \tu8 rsvd;\n };\n \n-enum i40e_client_state {\n-\t__I40E_CLIENT_NULL,\n-\t__I40E_CLIENT_REGISTERED\n+enum iavf_client_state {\n+\t__IAVF_CLIENT_NULL,\n+\t__IAVF_CLIENT_REGISTERED\n };\n \n-enum i40e_client_instance_state {\n-\t__I40E_CLIENT_INSTANCE_NONE,\n-\t__I40E_CLIENT_INSTANCE_OPENED,\n+enum iavf_client_instance_state {\n+\t__IAVF_CLIENT_INSTANCE_NONE,\n+\t__IAVF_CLIENT_INSTANCE_OPENED,\n };\n \n-struct i40e_ops;\n-struct i40e_client;\n+struct iavf_ops;\n+struct iavf_client;\n \n /* HW does not define a type value for AEQ; only for RX/TX and CEQ.\n * In order for us to keep the interface simple, SW will define a\n * unique type value for AEQ.\n */\n-#define I40E_QUEUE_TYPE_PE_AEQ 0x80\n-#define I40E_QUEUE_INVALID_IDX\t0xFFFF\n+#define IAVF_QUEUE_TYPE_PE_AEQ 0x80\n+#define IAVF_QUEUE_INVALID_IDX\t0xFFFF\n \n-struct i40e_qv_info {\n+struct iavf_qv_info {\n \tu32 v_idx; /* msix_vector */\n \tu16 ceq_idx;\n \tu16 aeq_idx;\n \tu8 itr_idx;\n };\n \n-struct i40e_qvlist_info {\n+struct iavf_qvlist_info {\n \tu32 num_vectors;\n-\tstruct i40e_qv_info qv_info[1];\n+\tstruct iavf_qv_info qv_info[1];\n };\n \n-#define I40E_CLIENT_MSIX_ALL 0xFFFFFFFF\n+#define IAVF_CLIENT_MSIX_ALL 0xFFFFFFFF\n \n /* set of LAN parameters useful for clients managed by LAN */\n \n /* Struct to hold per priority info */\n-struct i40e_prio_qos_params {\n+struct iavf_prio_qos_params {\n \tu16 qs_handle; /* qs handle for prio */\n \tu8 tc; /* TC mapped to prio */\n \tu8 reserved;\n };\n \n-#define I40E_CLIENT_MAX_USER_PRIORITY 8\n+#define IAVF_CLIENT_MAX_USER_PRIORITY 8\n /* Struct to hold Client QoS */\n-struct i40e_qos_params {\n-\tstruct i40e_prio_qos_params prio_qos[I40E_CLIENT_MAX_USER_PRIORITY];\n+struct iavf_qos_params {\n+\tstruct iavf_prio_qos_params prio_qos[IAVF_CLIENT_MAX_USER_PRIORITY];\n };\n \n-struct i40e_params {\n-\tstruct i40e_qos_params qos;\n+struct iavf_params {\n+\tstruct iavf_qos_params qos;\n \tu16 mtu;\n \tu16 link_up; /* boolean */\n };\n \n /* Structure to hold LAN device info for a client device */\n-struct i40e_info {\n-\tstruct i40e_client_version version;\n+struct iavf_info {\n+\tstruct iavf_client_version version;\n \tu8 lanmac[6];\n \tstruct net_device *netdev;\n \tstruct pci_dev *pcidev;\n \tu8 __iomem *hw_addr;\n \tu8 fid;\t/* function id, PF id or VF id */\n-#define I40E_CLIENT_FTYPE_PF 0\n-#define I40E_CLIENT_FTYPE_VF 1\n+#define IAVF_CLIENT_FTYPE_PF 0\n+#define IAVF_CLIENT_FTYPE_VF 1\n \tu8 ftype; /* function type, PF or VF */\n \tvoid *vf; /* cast to iavf_adapter */\n \n \t/* All L2 params that could change during the life span of the device\n \t * and needs to be communicated to the client when they change\n \t */\n-\tstruct i40e_params params;\n-\tstruct i40e_ops *ops;\n+\tstruct iavf_params params;\n+\tstruct iavf_ops *ops;\n \n \tu16 msix_count;\t /* number of msix vectors*/\n \t/* Array down below will be dynamically allocated based on msix_count */\n@@ -104,66 +104,66 @@ struct i40e_info {\n \tu16 itr_index; /* Which ITR index the PE driver is suppose to use */\n };\n \n-struct i40e_ops {\n+struct iavf_ops {\n \t/* setup_q_vector_list enables queues with a particular vector */\n-\tint (*setup_qvlist)(struct i40e_info *ldev, struct i40e_client *client,\n-\t\t\t struct i40e_qvlist_info *qv_info);\n+\tint (*setup_qvlist)(struct iavf_info *ldev, struct iavf_client *client,\n+\t\t\t struct iavf_qvlist_info *qv_info);\n \n-\tu32 (*virtchnl_send)(struct i40e_info *ldev, struct i40e_client *client,\n+\tu32 (*virtchnl_send)(struct iavf_info *ldev, struct iavf_client *client,\n \t\t\t u8 *msg, u16 len);\n \n \t/* If the PE Engine is unresponsive, RDMA driver can request a reset.*/\n-\tvoid (*request_reset)(struct i40e_info *ldev,\n-\t\t\t struct i40e_client *client);\n+\tvoid (*request_reset)(struct iavf_info *ldev,\n+\t\t\t struct iavf_client *client);\n };\n \n-struct i40e_client_ops {\n+struct iavf_client_ops {\n \t/* Should be called from register_client() or whenever the driver is\n \t * ready to create a specific client instance.\n \t */\n-\tint (*open)(struct i40e_info *ldev, struct i40e_client *client);\n+\tint (*open)(struct iavf_info *ldev, struct iavf_client *client);\n \n \t/* Should be closed when netdev is unavailable or when unregister\n \t * call comes in. If the close happens due to a reset, set the reset\n \t * bit to true.\n \t */\n-\tvoid (*close)(struct i40e_info *ldev, struct i40e_client *client,\n+\tvoid (*close)(struct iavf_info *ldev, struct iavf_client *client,\n \t\t bool reset);\n \n \t/* called when some l2 managed parameters changes - mss */\n-\tvoid (*l2_param_change)(struct i40e_info *ldev,\n-\t\t\t\tstruct i40e_client *client,\n-\t\t\t\tstruct i40e_params *params);\n+\tvoid (*l2_param_change)(struct iavf_info *ldev,\n+\t\t\t\tstruct iavf_client *client,\n+\t\t\t\tstruct iavf_params *params);\n \n \t/* called when a message is received from the PF */\n-\tint (*virtchnl_receive)(struct i40e_info *ldev,\n-\t\t\t\tstruct i40e_client *client,\n+\tint (*virtchnl_receive)(struct iavf_info *ldev,\n+\t\t\t\tstruct iavf_client *client,\n \t\t\t\tu8 *msg, u16 len);\n };\n \n /* Client device */\n-struct i40e_client_instance {\n+struct iavf_client_instance {\n \tstruct list_head list;\n-\tstruct i40e_info lan_info;\n-\tstruct i40e_client *client;\n+\tstruct iavf_info lan_info;\n+\tstruct iavf_client *client;\n \tunsigned long state;\n };\n \n-struct i40e_client {\n+struct iavf_client {\n \tstruct list_head list;\t\t/* list of registered clients */\n \tchar name[IAVF_CLIENT_STR_LENGTH];\n-\tstruct i40e_client_version version;\n+\tstruct iavf_client_version version;\n \tunsigned long state;\t\t/* client state */\n \tatomic_t ref_cnt; /* Count of all the client devices of this kind */\n \tu32 flags;\n-#define I40E_CLIENT_FLAGS_LAUNCH_ON_PROBE\tBIT(0)\n-#define I40E_TX_FLAGS_NOTIFY_OTHER_EVENTS\tBIT(2)\n+#define IAVF_CLIENT_FLAGS_LAUNCH_ON_PROBE\tBIT(0)\n+#define IAVF_TX_FLAGS_NOTIFY_OTHER_EVENTS\tBIT(2)\n \tu8 type;\n-#define I40E_CLIENT_IWARP 0\n-\tstruct i40e_client_ops *ops;\t/* client ops provided by the client */\n+#define IAVF_CLIENT_IWARP 0\n+\tstruct iavf_client_ops *ops;\t/* client ops provided by the client */\n };\n \n /* used by clients */\n-int iavf_register_client(struct i40e_client *client);\n-int iavf_unregister_client(struct i40e_client *client);\n+int iavf_register_client(struct iavf_client *client);\n+int iavf_unregister_client(struct iavf_client *client);\n #endif /* _IAVF_CLIENT_H_ */\n", "prefixes": [ "next", "S4", "iavf", "6/9" ] }