Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81783/?format=api
{ "id": 81783, "url": "http://patches.dpdk.org/api/patches/81783/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1603361181-21556-4-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1603361181-21556-4-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603361181-21556-4-git-send-email-arybchenko@solarflare.com", "date": "2020-10-22T10:06:20", "name": "[3/3] ethdev: move L2 tunnel config structure to ixgbe driver", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b87906689a411f6f153d46384d902a5ac6db0326", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1603361181-21556-4-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 13211, "url": "http://patches.dpdk.org/api/series/13211/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13211", "date": "2020-10-22T10:06:18", "name": "ethdev: remove L2 tunnel config API", "version": 1, "mbox": "http://patches.dpdk.org/series/13211/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/81783/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/81783/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D7AB2A04DD;\n\tThu, 22 Oct 2020 12:07:38 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 14FBCA9C4;\n\tThu, 22 Oct 2020 12:06:47 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 14EB4A9A1\n for <dev@dpdk.org>; Thu, 22 Oct 2020 12:06:37 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.137])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n A2D8120061; Thu, 22 Oct 2020 10:06:35 +0000 (UTC)", "from us4-mdac16-63.at1.mdlocal (unknown [10.110.50.156])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id A1A676009B;\n Thu, 22 Oct 2020 10:06:35 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.110.49.32])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 2514B220064;\n Thu, 22 Oct 2020 10:06:35 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n E186E280064;\n Thu, 22 Oct 2020 10:06:34 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Thu, 22 Oct 2020 11:06:30 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Thu, 22 Oct 2020 11:06:30 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09MA6Uw8016255;\n Thu, 22 Oct 2020 11:06:30 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 9C64F1613A9;\n Thu, 22 Oct 2020 11:06:30 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "Jeff Guo <jia.guo@intel.com>, Haiyue Wang <haiyue.wang@intel.com>, \"Thomas\n Monjalon\" <thomas@monjalon.net>, Ferruh Yigit <ferruh.yigit@intel.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "CC": "<dev@dpdk.org>", "Date": "Thu, 22 Oct 2020 11:06:20 +0100", "Message-ID": "<1603361181-21556-4-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1603361181-21556-1-git-send-email-arybchenko@solarflare.com>", "References": "<1603361181-21556-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.6.1012-25740.003", "X-TM-AS-Result": "No-1.732800-8.000000-10", "X-TMASE-MatchedRID": "rfk8EwZrOGm/kNGHVZrslklR2DE0NRdaeXZz1at5bOyKsTAa7Oe+YljI\n 3zmoXKKDIH2zryPqfYNw5T4Iaj538mJZXQNDzktSIAjxomarSPDYuVu0X/rOkBgxf9+T3i9bMFd\n dv+pLbreyiHjoKzXSzd5KdQvCHJZD5P8SrHH0jQTGL//8mlodAzB4tWHctlhIIYP4Wne9kdSi8Q\n AEcW7yzPTN0R3MdTGf8RldOeM/YZtY1B7Vsu7x2bixxDRpftwPx+jrF7TzRS0UE18jzz932mXge\n MJEe5CmDGa/pWDW//LhB5Iilm/06R8TzIzimOwPC24oEZ6SpSlR8RAUGq/SZw6lMloQ7G5h/UqU\n lKCT/t7MqMlNBsbqQn/bhc6YWDmRUh74nilwu20l7lxpy+ppNnu5mF0Ni82eV2enmgmQuBZhrvp\n bMU1/eOQDw6tgd3AMZ9iVj/KhX/RSnoQc5vb5zuQdkM7ndBLCO8/z8zQ+NO3AvpLE+mvX8g==", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-1.732800-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25740.003", "X-MDID": "1603361195-9aQq-fQSOWQD", "X-PPE-DISP": "1603361195;9aQq-fQSOWQD", "Subject": "[dpdk-dev] [PATCH 3/3] ethdev: move L2 tunnel config structure to\n\tixgbe driver", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "net/ixgbe driver is the only user of the struct rte_eth_l2_tunnel_conf.\nMove it to the driver and use ixgbe_ prefix instead of rte_eth_.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/ixgbe/ixgbe_ethdev.c | 12 ++++-----\n drivers/net/ixgbe/ixgbe_ethdev.h | 16 ++++++++++--\n drivers/net/ixgbe/ixgbe_flow.c | 42 ++++++++++++++++----------------\n lib/librte_ethdev/rte_eth_ctrl.h | 11 ---------\n 4 files changed, 41 insertions(+), 40 deletions(-)", "diff": "diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 9c91b8cde8..23baa5e9c5 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -7550,7 +7550,7 @@ ixgbe_e_tag_enable(struct ixgbe_hw *hw)\n \n static int\n ixgbe_e_tag_filter_del(struct rte_eth_dev *dev,\n-\t\t struct rte_eth_l2_tunnel_conf *l2_tunnel)\n+\t\t struct ixgbe_l2_tunnel_conf *l2_tunnel)\n {\n \tint ret = 0;\n \tstruct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n@@ -7586,7 +7586,7 @@ ixgbe_e_tag_filter_del(struct rte_eth_dev *dev,\n \n static int\n ixgbe_e_tag_filter_add(struct rte_eth_dev *dev,\n-\t\t struct rte_eth_l2_tunnel_conf *l2_tunnel)\n+\t\t struct ixgbe_l2_tunnel_conf *l2_tunnel)\n {\n \tint ret = 0;\n \tstruct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n@@ -7690,7 +7690,7 @@ ixgbe_remove_l2_tn_filter(struct ixgbe_l2_tn_info *l2_tn_info,\n /* Add l2 tunnel filter */\n int\n ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,\n-\t\t\t struct rte_eth_l2_tunnel_conf *l2_tunnel,\n+\t\t\t struct ixgbe_l2_tunnel_conf *l2_tunnel,\n \t\t\t bool restore)\n {\n \tint ret;\n@@ -7747,7 +7747,7 @@ ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,\n /* Delete l2 tunnel filter */\n int\n ixgbe_dev_l2_tunnel_filter_del(struct rte_eth_dev *dev,\n-\t\t\t struct rte_eth_l2_tunnel_conf *l2_tunnel)\n+\t\t\t struct ixgbe_l2_tunnel_conf *l2_tunnel)\n {\n \tint ret;\n \tstruct ixgbe_l2_tn_info *l2_tn_info =\n@@ -8169,7 +8169,7 @@ ixgbe_l2_tn_filter_restore(struct rte_eth_dev *dev)\n \tstruct ixgbe_l2_tn_info *l2_tn_info =\n \t\tIXGBE_DEV_PRIVATE_TO_L2_TN_INFO(dev->data->dev_private);\n \tstruct ixgbe_l2_tn_filter *node;\n-\tstruct rte_eth_l2_tunnel_conf l2_tn_conf;\n+\tstruct ixgbe_l2_tunnel_conf l2_tn_conf;\n \n \tTAILQ_FOREACH(node, &l2_tn_info->l2_tn_list, entries) {\n \t\tl2_tn_conf.l2_tunnel_type = node->key.l2_tn_type;\n@@ -8276,7 +8276,7 @@ ixgbe_clear_all_l2_tn_filter(struct rte_eth_dev *dev)\n \tstruct ixgbe_l2_tn_info *l2_tn_info =\n \t\tIXGBE_DEV_PRIVATE_TO_L2_TN_INFO(dev->data->dev_private);\n \tstruct ixgbe_l2_tn_filter *l2_tn_filter;\n-\tstruct rte_eth_l2_tunnel_conf l2_tn_conf;\n+\tstruct ixgbe_l2_tunnel_conf l2_tn_conf;\n \tint ret = 0;\n \n \twhile ((l2_tn_filter = TAILQ_FIRST(&l2_tn_info->l2_tn_list))) {\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h\nindex a4f7d184b5..ff0ab78f5d 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.h\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.h\n@@ -678,13 +678,25 @@ int ixgbe_add_del_ethertype_filter(struct rte_eth_dev *dev,\n int ixgbe_syn_filter_set(struct rte_eth_dev *dev,\n \t\t\tstruct rte_eth_syn_filter *filter,\n \t\t\tbool add);\n+\n+/**\n+ * l2 tunnel configuration.\n+ */\n+struct ixgbe_l2_tunnel_conf {\n+\tenum rte_eth_tunnel_type l2_tunnel_type;\n+\tuint16_t ether_type; /* ether type in l2 header */\n+\tuint32_t tunnel_id; /* port tag id for e-tag */\n+\tuint16_t vf_id; /* VF id for tag insertion */\n+\tuint32_t pool; /* destination pool for tag based forwarding */\n+};\n+\n int\n ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,\n-\t\t\t struct rte_eth_l2_tunnel_conf *l2_tunnel,\n+\t\t\t struct ixgbe_l2_tunnel_conf *l2_tunnel,\n \t\t\t bool restore);\n int\n ixgbe_dev_l2_tunnel_filter_del(struct rte_eth_dev *dev,\n-\t\t\t struct rte_eth_l2_tunnel_conf *l2_tunnel);\n+\t\t\t struct ixgbe_l2_tunnel_conf *l2_tunnel);\n void ixgbe_filterlist_init(void);\n void ixgbe_filterlist_flush(void);\n /*\ndiff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c\nindex 6b3dea46ee..dff04c462c 100644\n--- a/drivers/net/ixgbe/ixgbe_flow.c\n+++ b/drivers/net/ixgbe/ixgbe_flow.c\n@@ -72,7 +72,7 @@ struct ixgbe_fdir_rule_ele {\n /* l2_tunnel filter list structure */\n struct ixgbe_eth_l2_tunnel_conf_ele {\n \tTAILQ_ENTRY(ixgbe_eth_l2_tunnel_conf_ele) entries;\n-\tstruct rte_eth_l2_tunnel_conf filter_info;\n+\tstruct ixgbe_l2_tunnel_conf filter_info;\n };\n /* rss filter list structure */\n struct ixgbe_rss_conf_ele {\n@@ -1197,7 +1197,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t\t\tconst struct rte_flow_attr *attr,\n \t\t\tconst struct rte_flow_item pattern[],\n \t\t\tconst struct rte_flow_action actions[],\n-\t\t\tstruct rte_eth_l2_tunnel_conf *filter,\n+\t\t\tstruct ixgbe_l2_tunnel_conf *filter,\n \t\t\tstruct rte_flow_error *error)\n {\n \tconst struct rte_flow_item *item;\n@@ -1231,7 +1231,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t/* The first not void item should be e-tag. */\n \titem = next_no_void_pattern(pattern, NULL);\n \tif (item->type != RTE_FLOW_ITEM_TYPE_E_TAG) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\titem, \"Not supported by L2 tunnel filter\");\n@@ -1239,7 +1239,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t}\n \n \tif (!item->spec || !item->mask) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\titem, \"Not supported by L2 tunnel filter\");\n \t\treturn -rte_errno;\n@@ -1261,7 +1261,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t e_tag_mask->in_ecid_e ||\n \t e_tag_mask->ecid_e ||\n \t e_tag_mask->rsvd_grp_ecid_b != rte_cpu_to_be_16(0x3FFF)) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\titem, \"Not supported by L2 tunnel filter\");\n@@ -1278,7 +1278,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t/* check if the next not void item is END */\n \titem = next_no_void_pattern(pattern, item);\n \tif (item->type != RTE_FLOW_ITEM_TYPE_END) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\titem, \"Not supported by L2 tunnel filter\");\n@@ -1288,7 +1288,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t/* parse attr */\n \t/* must be input direction */\n \tif (!attr->ingress) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ATTR_INGRESS,\n \t\t\tattr, \"Only support ingress.\");\n@@ -1297,7 +1297,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \n \t/* not supported */\n \tif (attr->egress) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ATTR_EGRESS,\n \t\t\tattr, \"Not support egress.\");\n@@ -1306,7 +1306,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \n \t/* not supported */\n \tif (attr->transfer) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,\n \t\t\tattr, \"No support for transfer.\");\n@@ -1315,7 +1315,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \n \t/* not supported */\n \tif (attr->priority) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,\n \t\t\tattr, \"Not support priority.\");\n@@ -1326,7 +1326,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \tact = next_no_void_action(actions, NULL);\n \tif (act->type != RTE_FLOW_ACTION_TYPE_VF &&\n \t\t\tact->type != RTE_FLOW_ACTION_TYPE_PF) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\n \t\t\tact, \"Not supported action.\");\n@@ -1343,7 +1343,7 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t/* check if the next not void item is END */\n \tact = next_no_void_action(actions, act);\n \tif (act->type != RTE_FLOW_ACTION_TYPE_END) {\n-\t\tmemset(filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\n \t\t\tact, \"Not supported action.\");\n@@ -1358,7 +1358,7 @@ ixgbe_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \t\t\tconst struct rte_flow_attr *attr,\n \t\t\tconst struct rte_flow_item pattern[],\n \t\t\tconst struct rte_flow_action actions[],\n-\t\t\tstruct rte_eth_l2_tunnel_conf *l2_tn_filter,\n+\t\t\tstruct ixgbe_l2_tunnel_conf *l2_tn_filter,\n \t\t\tstruct rte_flow_error *error)\n {\n \tint ret = 0;\n@@ -1372,7 +1372,7 @@ ixgbe_parse_l2_tn_filter(struct rte_eth_dev *dev,\n \tif (hw->mac.type != ixgbe_mac_X550 &&\n \t\thw->mac.type != ixgbe_mac_X550EM_x &&\n \t\thw->mac.type != ixgbe_mac_X550EM_a) {\n-\t\tmemset(l2_tn_filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\t\tmemset(l2_tn_filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n \t\t\tNULL, \"Not supported by L2 tunnel filter\");\n@@ -3023,7 +3023,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,\n \tstruct rte_eth_ethertype_filter ethertype_filter;\n \tstruct rte_eth_syn_filter syn_filter;\n \tstruct ixgbe_fdir_rule fdir_rule;\n-\tstruct rte_eth_l2_tunnel_conf l2_tn_filter;\n+\tstruct ixgbe_l2_tunnel_conf l2_tn_filter;\n \tstruct ixgbe_hw_fdir_info *fdir_info =\n \t\tIXGBE_DEV_PRIVATE_TO_FDIR_INFO(dev->data->dev_private);\n \tstruct ixgbe_rte_flow_rss_conf rss_conf;\n@@ -3211,7 +3211,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,\n \t\tgoto out;\n \t}\n \n-\tmemset(&l2_tn_filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\tmemset(&l2_tn_filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \tret = ixgbe_parse_l2_tn_filter(dev, attr, pattern,\n \t\t\t\t\tactions, &l2_tn_filter, error);\n \tif (!ret) {\n@@ -3225,7 +3225,7 @@ ixgbe_flow_create(struct rte_eth_dev *dev,\n \t\t\t}\n \t\t\trte_memcpy(&l2_tn_filter_ptr->filter_info,\n \t\t\t\t&l2_tn_filter,\n-\t\t\t\tsizeof(struct rte_eth_l2_tunnel_conf));\n+\t\t\t\tsizeof(struct ixgbe_l2_tunnel_conf));\n \t\t\tTAILQ_INSERT_TAIL(&filter_l2_tunnel_list,\n \t\t\t\tl2_tn_filter_ptr, entries);\n \t\t\tflow->rule = l2_tn_filter_ptr;\n@@ -3282,7 +3282,7 @@ ixgbe_flow_validate(struct rte_eth_dev *dev,\n \tstruct rte_eth_ntuple_filter ntuple_filter;\n \tstruct rte_eth_ethertype_filter ethertype_filter;\n \tstruct rte_eth_syn_filter syn_filter;\n-\tstruct rte_eth_l2_tunnel_conf l2_tn_filter;\n+\tstruct ixgbe_l2_tunnel_conf l2_tn_filter;\n \tstruct ixgbe_fdir_rule fdir_rule;\n \tstruct ixgbe_rte_flow_rss_conf rss_conf;\n \tint ret;\n@@ -3311,7 +3311,7 @@ ixgbe_flow_validate(struct rte_eth_dev *dev,\n \tif (!ret)\n \t\treturn 0;\n \n-\tmemset(&l2_tn_filter, 0, sizeof(struct rte_eth_l2_tunnel_conf));\n+\tmemset(&l2_tn_filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));\n \tret = ixgbe_parse_l2_tn_filter(dev, attr, pattern,\n \t\t\t\tactions, &l2_tn_filter, error);\n \tif (!ret)\n@@ -3337,7 +3337,7 @@ ixgbe_flow_destroy(struct rte_eth_dev *dev,\n \tstruct rte_eth_ethertype_filter ethertype_filter;\n \tstruct rte_eth_syn_filter syn_filter;\n \tstruct ixgbe_fdir_rule fdir_rule;\n-\tstruct rte_eth_l2_tunnel_conf l2_tn_filter;\n+\tstruct ixgbe_l2_tunnel_conf l2_tn_filter;\n \tstruct ixgbe_ntuple_filter_ele *ntuple_filter_ptr;\n \tstruct ixgbe_ethertype_filter_ele *ethertype_filter_ptr;\n \tstruct ixgbe_eth_syn_filter_ele *syn_filter_ptr;\n@@ -3407,7 +3407,7 @@ ixgbe_flow_destroy(struct rte_eth_dev *dev,\n \t\tl2_tn_filter_ptr = (struct ixgbe_eth_l2_tunnel_conf_ele *)\n \t\t\t\tpmd_flow->rule;\n \t\trte_memcpy(&l2_tn_filter, &l2_tn_filter_ptr->filter_info,\n-\t\t\tsizeof(struct rte_eth_l2_tunnel_conf));\n+\t\t\tsizeof(struct ixgbe_l2_tunnel_conf));\n \t\tret = ixgbe_dev_l2_tunnel_filter_del(dev, &l2_tn_filter);\n \t\tif (!ret) {\n \t\t\tTAILQ_REMOVE(&filter_l2_tunnel_list,\ndiff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_ctrl.h\nindex 012e8059ad..1cca522fa3 100644\n--- a/lib/librte_ethdev/rte_eth_ctrl.h\n+++ b/lib/librte_ethdev/rte_eth_ctrl.h\n@@ -486,17 +486,6 @@ struct rte_eth_fdir_stats {\n \tuint32_t best_cnt; /**< Number of filters in best effort spaces. */\n };\n \n-/**\n- * l2 tunnel configuration.\n- */\n-struct rte_eth_l2_tunnel_conf {\n-\tenum rte_eth_tunnel_type l2_tunnel_type;\n-\tuint16_t ether_type; /* ether type in l2 header */\n-\tuint32_t tunnel_id; /* port tag id for e-tag */\n-\tuint16_t vf_id; /* VF id for tag insertion */\n-\tuint32_t pool; /* destination pool for tag based forwarding */\n-};\n-\n #ifdef __cplusplus\n }\n #endif\n", "prefixes": [ "3/3" ] }