Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81759/?format=api
{ "id": 81759, "url": "http://patches.dpdk.org/api/patches/81759/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1603359758-13297-3-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": "<1603359758-13297-3-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603359758-13297-3-git-send-email-arybchenko@solarflare.com", "date": "2020-10-22T09:42:25", "name": "[v2,02/14] ethdev: move MAC filter type to i40e driver", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1bf95c6a97aa4c0f5e2089ee7ef45ce8e34901df", "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/1603359758-13297-3-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 13207, "url": "http://patches.dpdk.org/api/series/13207/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13207", "date": "2020-10-22T09:42:23", "name": "ethdev: remove legacy filter API", "version": 2, "mbox": "http://patches.dpdk.org/series/13207/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/81759/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/81759/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 928DDA04DD;\n\tThu, 22 Oct 2020 11:43:24 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 35D8CA966;\n\tThu, 22 Oct 2020 11:43:10 +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 6ED4AA961\n for <dev@dpdk.org>; Thu, 22 Oct 2020 11:43:04 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.143])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n 0524C2006B; Thu, 22 Oct 2020 09:43:03 +0000 (UTC)", "from us4-mdac16-21.at1.mdlocal (unknown [10.110.49.203])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 044FD8009B;\n Thu, 22 Oct 2020 09:43:03 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.110.48.45])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 2CD374006E;\n Thu, 22 Oct 2020 09:43:02 +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 BA1FA94005E;\n Thu, 22 Oct 2020 09:43:01 +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 10:42:59 +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 10:42:59 +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 09M9gwI5023016;\n Thu, 22 Oct 2020 10:42:58 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id DA3EB1613AB;\n Thu, 22 Oct 2020 10:42:58 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "Beilei Xing <beilei.xing@intel.com>, Jeff Guo <jia.guo@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 10:42:25 +0100", "Message-ID": "<1603359758-13297-3-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1603359758-13297-1-git-send-email-arybchenko@solarflare.com>", "References": "<1603030152-13451-1-git-send-email-arybchenko@solarflare.com>\n <1603359758-13297-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.054800-8.000000-10", "X-TMASE-MatchedRID": "KQ3ld5ivywa/kNGHVZrslklR2DE0NRda3FYvKmZiVnM7OtcKFS0EBNN+\n VO8UR4MhfGzuoVn0Vs6PQi9XuOWoOPwfXc9ZWlYMR/j040fRFpL2155bpR+TIAv1OPvvDLzsXWj\n vA8TpWFhiDAh5k2kAw2WQifIHHZm6MNC3Xj2tG7LGL//8mlodAzefdE7h0G9U9JNRVzW5ZwmDuU\n 30s68UO+VjSh+visOe/GpF3Kp5Knu1DfGM6db7Xw97mDMXdNW3jHhXj1NLbjDLmsnRFz6pJpUmI\n 4+Q9tu2gEMeUbUICxqQ+iKT+7tgt+ztpCSqSkXKvoQkZKo949N7xIKEgZq/AS6Zl5fVYhDwrW41\n +BBqq+9C0EtKHL9bQOIGJZ6+qv8rHxPMjOKY7A8LbigRnpKlKVHxEBQar9JncQtAYghpDjopqH4\n wo4cyUPFh+bYdm8r1W4Q0ASKjHrP1U83U3I3fGQ/7WFXrZDitfkWh2Sk5saTSyQY2YXQwMYtCJw\n ovoGdD5APDq2B3cAxn2JWP8qFf9FKehBzm9vnO5B2Qzud0EsI7z/PzND407cC+ksT6a9fy", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-1.054800-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25740.003", "X-MDID": "1603359782-A6_7rRs0MeWJ", "X-PPE-DISP": "1603359782;A6_7rRs0MeWJ", "Subject": "[dpdk-dev] [PATCH v2 02/14] ethdev: move MAC filter type to i40e\n\tdriver", "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/i40e driver is the only user of the enum rte_mac_filter_type.\nMove the define to the driver and use i40e_ prefix instead of rte_.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/i40e/i40e_ethdev.c | 58 ++++++++++++++++----------------\n drivers/net/i40e/i40e_ethdev.h | 15 +++++++--\n drivers/net/i40e/i40e_pf.c | 2 +-\n drivers/net/i40e/rte_pmd_i40e.c | 30 ++++++++---------\n lib/librte_ethdev/rte_eth_ctrl.h | 11 ------\n 5 files changed, 58 insertions(+), 58 deletions(-)", "diff": "diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 217a7bbbd8..e298d7aee6 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -4329,9 +4329,9 @@ i40e_macaddr_add(struct rte_eth_dev *dev,\n \n \trte_memcpy(&mac_filter.mac_addr, mac_addr, RTE_ETHER_ADDR_LEN);\n \tif (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER)\n-\t\tmac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n+\t\tmac_filter.filter_type = I40E_MACVLAN_PERFECT_MATCH;\n \telse\n-\t\tmac_filter.filter_type = RTE_MAC_PERFECT_MATCH;\n+\t\tmac_filter.filter_type = I40E_MAC_PERFECT_MATCH;\n \n \tif (pool == 0)\n \t\tvsi = pf->main_vsi;\n@@ -5537,7 +5537,7 @@ i40e_update_default_filter_setting(struct i40e_vsi *vsi)\n \t\tmac = &f->mac_info.mac_addr;\n \t\trte_memcpy(&mac->addr_bytes, hw->mac.perm_addr,\n \t\t\t\tETH_ADDR_LEN);\n-\t\tf->mac_info.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n+\t\tf->mac_info.filter_type = I40E_MACVLAN_PERFECT_MATCH;\n \t\tTAILQ_INSERT_TAIL(&vsi->mac_list, f, next);\n \t\tvsi->mac_num++;\n \n@@ -5545,7 +5545,7 @@ i40e_update_default_filter_setting(struct i40e_vsi *vsi)\n \t}\n \trte_memcpy(&filter.mac_addr,\n \t\t(struct rte_ether_addr *)(hw->mac.perm_addr), ETH_ADDR_LEN);\n-\tfilter.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n+\tfilter.filter_type = I40E_MACVLAN_PERFECT_MATCH;\n \treturn i40e_vsi_add_mac(vsi, &filter);\n }\n \n@@ -6011,7 +6011,7 @@ i40e_vsi_setup(struct i40e_pf *pf,\n \n \t/* MAC/VLAN configuration */\n \trte_memcpy(&filter.mac_addr, &broadcast, RTE_ETHER_ADDR_LEN);\n-\tfilter.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n+\tfilter.filter_type = I40E_MACVLAN_PERFECT_MATCH;\n \n \tret = i40e_vsi_add_mac(vsi, &filter);\n \tif (ret != I40E_SUCCESS) {\n@@ -6039,15 +6039,15 @@ i40e_vsi_config_vlan_filter(struct i40e_vsi *vsi, bool on)\n \tstruct i40e_mac_filter *f;\n \tvoid *temp;\n \tstruct i40e_mac_filter_info *mac_filter;\n-\tenum rte_mac_filter_type desired_filter;\n+\tenum i40e_mac_filter_type desired_filter;\n \tint ret = I40E_SUCCESS;\n \n \tif (on) {\n \t\t/* Filter to match MAC and VLAN */\n-\t\tdesired_filter = RTE_MACVLAN_PERFECT_MATCH;\n+\t\tdesired_filter = I40E_MACVLAN_PERFECT_MATCH;\n \t} else {\n \t\t/* Filter to match only MAC */\n-\t\tdesired_filter = RTE_MAC_PERFECT_MATCH;\n+\t\tdesired_filter = I40E_MAC_PERFECT_MATCH;\n \t}\n \n \tnum = vsi->mac_num;\n@@ -6990,18 +6990,18 @@ i40e_add_macvlan_filters(struct i40e_vsi *vsi,\n \t\t\t\trte_cpu_to_le_16(filter[num + i].vlan_id);\n \n \t\t\tswitch (filter[num + i].filter_type) {\n-\t\t\tcase RTE_MAC_PERFECT_MATCH:\n+\t\t\tcase I40E_MAC_PERFECT_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_ADD_PERFECT_MATCH |\n \t\t\t\t\tI40E_AQC_MACVLAN_ADD_IGNORE_VLAN;\n \t\t\t\tbreak;\n-\t\t\tcase RTE_MACVLAN_PERFECT_MATCH:\n+\t\t\tcase I40E_MACVLAN_PERFECT_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_ADD_PERFECT_MATCH;\n \t\t\t\tbreak;\n-\t\t\tcase RTE_MAC_HASH_MATCH:\n+\t\t\tcase I40E_MAC_HASH_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_ADD_HASH_MATCH |\n \t\t\t\t\tI40E_AQC_MACVLAN_ADD_IGNORE_VLAN;\n \t\t\t\tbreak;\n-\t\t\tcase RTE_MACVLAN_HASH_MATCH:\n+\t\t\tcase I40E_MACVLAN_HASH_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_ADD_HASH_MATCH;\n \t\t\t\tbreak;\n \t\t\tdefault:\n@@ -7065,18 +7065,18 @@ i40e_remove_macvlan_filters(struct i40e_vsi *vsi,\n \t\t\t\trte_cpu_to_le_16(filter[num + i].vlan_id);\n \n \t\t\tswitch (filter[num + i].filter_type) {\n-\t\t\tcase RTE_MAC_PERFECT_MATCH:\n+\t\t\tcase I40E_MAC_PERFECT_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_DEL_PERFECT_MATCH |\n \t\t\t\t\tI40E_AQC_MACVLAN_DEL_IGNORE_VLAN;\n \t\t\t\tbreak;\n-\t\t\tcase RTE_MACVLAN_PERFECT_MATCH:\n+\t\t\tcase I40E_MACVLAN_PERFECT_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_DEL_PERFECT_MATCH;\n \t\t\t\tbreak;\n-\t\t\tcase RTE_MAC_HASH_MATCH:\n+\t\t\tcase I40E_MAC_HASH_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_DEL_HASH_MATCH |\n \t\t\t\t\tI40E_AQC_MACVLAN_DEL_IGNORE_VLAN;\n \t\t\t\tbreak;\n-\t\t\tcase RTE_MACVLAN_HASH_MATCH:\n+\t\t\tcase I40E_MACVLAN_HASH_MATCH:\n \t\t\t\tflags = I40E_AQC_MACVLAN_DEL_HASH_MATCH;\n \t\t\t\tbreak;\n \t\t\tdefault:\n@@ -7421,8 +7421,8 @@ i40e_vsi_add_mac(struct i40e_vsi *vsi, struct i40e_mac_filter_info *mac_filter)\n \tf = i40e_find_mac_filter(vsi, &mac_filter->mac_addr);\n \tif (f != NULL)\n \t\treturn I40E_SUCCESS;\n-\tif ((mac_filter->filter_type == RTE_MACVLAN_PERFECT_MATCH) ||\n-\t\t(mac_filter->filter_type == RTE_MACVLAN_HASH_MATCH)) {\n+\tif (mac_filter->filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\tmac_filter->filter_type == I40E_MACVLAN_HASH_MATCH) {\n \n \t\t/**\n \t\t * If vlan_num is 0, that's the first time to add mac,\n@@ -7433,8 +7433,8 @@ i40e_vsi_add_mac(struct i40e_vsi *vsi, struct i40e_mac_filter_info *mac_filter)\n \t\t\tvsi->vlan_num = 1;\n \t\t}\n \t\tvlan_num = vsi->vlan_num;\n-\t} else if ((mac_filter->filter_type == RTE_MAC_PERFECT_MATCH) ||\n-\t\t\t(mac_filter->filter_type == RTE_MAC_HASH_MATCH))\n+\t} else if (mac_filter->filter_type == I40E_MAC_PERFECT_MATCH ||\n+\t\t\tmac_filter->filter_type == I40E_MAC_HASH_MATCH)\n \t\tvlan_num = 1;\n \n \tmv_f = rte_zmalloc(\"macvlan_data\", vlan_num * sizeof(*mv_f), 0);\n@@ -7449,8 +7449,8 @@ i40e_vsi_add_mac(struct i40e_vsi *vsi, struct i40e_mac_filter_info *mac_filter)\n \t\t\t\tETH_ADDR_LEN);\n \t}\n \n-\tif (mac_filter->filter_type == RTE_MACVLAN_PERFECT_MATCH ||\n-\t\tmac_filter->filter_type == RTE_MACVLAN_HASH_MATCH) {\n+\tif (mac_filter->filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\tmac_filter->filter_type == I40E_MACVLAN_HASH_MATCH) {\n \t\tret = i40e_find_all_vlan_for_mac(vsi, mv_f, vlan_num,\n \t\t\t\t\t&mac_filter->mac_addr);\n \t\tif (ret != I40E_SUCCESS)\n@@ -7487,7 +7487,7 @@ i40e_vsi_delete_mac(struct i40e_vsi *vsi, struct rte_ether_addr *addr)\n \tstruct i40e_mac_filter *f;\n \tstruct i40e_macvlan_filter *mv_f;\n \tint i, vlan_num;\n-\tenum rte_mac_filter_type filter_type;\n+\tenum i40e_mac_filter_type filter_type;\n \tint ret = I40E_SUCCESS;\n \n \t/* Can't find it, return an error */\n@@ -7497,14 +7497,14 @@ i40e_vsi_delete_mac(struct i40e_vsi *vsi, struct rte_ether_addr *addr)\n \n \tvlan_num = vsi->vlan_num;\n \tfilter_type = f->mac_info.filter_type;\n-\tif (filter_type == RTE_MACVLAN_PERFECT_MATCH ||\n-\t\tfilter_type == RTE_MACVLAN_HASH_MATCH) {\n+\tif (filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\tfilter_type == I40E_MACVLAN_HASH_MATCH) {\n \t\tif (vlan_num == 0) {\n \t\t\tPMD_DRV_LOG(ERR, \"VLAN number shouldn't be 0\");\n \t\t\treturn I40E_ERR_PARAM;\n \t\t}\n-\t} else if (filter_type == RTE_MAC_PERFECT_MATCH ||\n-\t\t\tfilter_type == RTE_MAC_HASH_MATCH)\n+\t} else if (filter_type == I40E_MAC_PERFECT_MATCH ||\n+\t\t\tfilter_type == I40E_MAC_HASH_MATCH)\n \t\tvlan_num = 1;\n \n \tmv_f = rte_zmalloc(\"macvlan_data\", vlan_num * sizeof(*mv_f), 0);\n@@ -7518,8 +7518,8 @@ i40e_vsi_delete_mac(struct i40e_vsi *vsi, struct rte_ether_addr *addr)\n \t\trte_memcpy(&mv_f[i].macaddr, &f->mac_info.mac_addr,\n \t\t\t\tETH_ADDR_LEN);\n \t}\n-\tif (filter_type == RTE_MACVLAN_PERFECT_MATCH ||\n-\t\t\tfilter_type == RTE_MACVLAN_HASH_MATCH) {\n+\tif (filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\t\tfilter_type == I40E_MACVLAN_HASH_MATCH) {\n \t\tret = i40e_find_all_vlan_for_mac(vsi, mv_f, vlan_num, addr);\n \t\tif (ret != I40E_SUCCESS)\n \t\t\tgoto DONE;\ndiff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h\nindex 1466998aa1..458219c784 100644\n--- a/drivers/net/i40e/i40e_ethdev.h\n+++ b/drivers/net/i40e/i40e_ethdev.h\n@@ -288,11 +288,22 @@ struct rte_flow {\n struct i40e_adapter;\n struct rte_pci_driver;\n \n+/**\n+ * MAC filter type\n+ */\n+enum i40e_mac_filter_type {\n+\tI40E_MAC_PERFECT_MATCH = 1, /**< exact match of MAC addr. */\n+\tI40E_MACVLAN_PERFECT_MATCH, /**< exact match of MAC addr and VLAN ID. */\n+\tI40E_MAC_HASH_MATCH, /**< hash match of MAC addr. */\n+\t/** hash match of MAC addr and exact match of VLAN ID. */\n+\tI40E_MACVLAN_HASH_MATCH,\n+};\n+\n /**\n * MAC filter structure\n */\n struct i40e_mac_filter_info {\n-\tenum rte_mac_filter_type filter_type;\n+\tenum i40e_mac_filter_type filter_type;\n \tstruct rte_ether_addr mac_addr;\n };\n \n@@ -347,7 +358,7 @@ struct i40e_veb {\n /* i40e MACVLAN filter structure */\n struct i40e_macvlan_filter {\n \tstruct rte_ether_addr macaddr;\n-\tenum rte_mac_filter_type filter_type;\n+\tenum i40e_mac_filter_type filter_type;\n \tuint16_t vlan_id;\n };\n \ndiff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c\nindex 03c2070c3f..65d649b627 100644\n--- a/drivers/net/i40e/i40e_pf.c\n+++ b/drivers/net/i40e/i40e_pf.c\n@@ -844,7 +844,7 @@ i40e_pf_host_process_cmd_add_ether_address(struct i40e_pf_vf *vf,\n \tfor (i = 0; i < addr_list->num_elements; i++) {\n \t\tmac = (struct rte_ether_addr *)(addr_list->list[i].addr);\n \t\trte_memcpy(&filter.mac_addr, mac, RTE_ETHER_ADDR_LEN);\n-\t\tfilter.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n+\t\tfilter.filter_type = I40E_MACVLAN_PERFECT_MATCH;\n \t\tif (rte_is_zero_ether_addr(mac) ||\n \t\t i40e_vsi_add_mac(vf->vsi, &filter)) {\n \t\t\tret = I40E_ERR_INVALID_MAC_ADDR;\ndiff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c\nindex 17938e7d30..790d042002 100644\n--- a/drivers/net/i40e/rte_pmd_i40e.c\n+++ b/drivers/net/i40e/rte_pmd_i40e.c\n@@ -211,7 +211,7 @@ i40e_vsi_rm_mac_filter(struct i40e_vsi *vsi)\n \tstruct i40e_mac_filter *f;\n \tstruct i40e_macvlan_filter *mv_f;\n \tint i, vlan_num;\n-\tenum rte_mac_filter_type filter_type;\n+\tenum i40e_mac_filter_type filter_type;\n \tint ret = I40E_SUCCESS;\n \tvoid *temp;\n \n@@ -219,14 +219,14 @@ i40e_vsi_rm_mac_filter(struct i40e_vsi *vsi)\n \tTAILQ_FOREACH_SAFE(f, &vsi->mac_list, next, temp) {\n \t\tvlan_num = vsi->vlan_num;\n \t\tfilter_type = f->mac_info.filter_type;\n-\t\tif (filter_type == RTE_MACVLAN_PERFECT_MATCH ||\n-\t\t filter_type == RTE_MACVLAN_HASH_MATCH) {\n+\t\tif (filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\t filter_type == I40E_MACVLAN_HASH_MATCH) {\n \t\t\tif (vlan_num == 0) {\n \t\t\t\tPMD_DRV_LOG(ERR, \"VLAN number shouldn't be 0\");\n \t\t\t\treturn I40E_ERR_PARAM;\n \t\t\t}\n-\t\t} else if (filter_type == RTE_MAC_PERFECT_MATCH ||\n-\t\t\t filter_type == RTE_MAC_HASH_MATCH)\n+\t\t} else if (filter_type == I40E_MAC_PERFECT_MATCH ||\n+\t\t\t filter_type == I40E_MAC_HASH_MATCH)\n \t\t\tvlan_num = 1;\n \n \t\tmv_f = rte_zmalloc(\"macvlan_data\", vlan_num * sizeof(*mv_f), 0);\n@@ -241,8 +241,8 @@ i40e_vsi_rm_mac_filter(struct i40e_vsi *vsi)\n \t\t\t\t\t &f->mac_info.mac_addr,\n \t\t\t\t\t ETH_ADDR_LEN);\n \t\t}\n-\t\tif (filter_type == RTE_MACVLAN_PERFECT_MATCH ||\n-\t\t filter_type == RTE_MACVLAN_HASH_MATCH) {\n+\t\tif (filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\t filter_type == I40E_MACVLAN_HASH_MATCH) {\n \t\t\tret = i40e_find_all_vlan_for_mac(vsi, mv_f, vlan_num,\n \t\t\t\t\t\t\t &f->mac_info.mac_addr);\n \t\t\tif (ret != I40E_SUCCESS) {\n@@ -275,8 +275,8 @@ i40e_vsi_restore_mac_filter(struct i40e_vsi *vsi)\n \n \t/* restore all the MACs */\n \tTAILQ_FOREACH_SAFE(f, &vsi->mac_list, next, temp) {\n-\t\tif ((f->mac_info.filter_type == RTE_MACVLAN_PERFECT_MATCH) ||\n-\t\t (f->mac_info.filter_type == RTE_MACVLAN_HASH_MATCH)) {\n+\t\tif (f->mac_info.filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\t f->mac_info.filter_type == I40E_MACVLAN_HASH_MATCH) {\n \t\t\t/**\n \t\t\t * If vlan_num is 0, that's the first time to add mac,\n \t\t\t * set mask for vlan_id 0.\n@@ -286,8 +286,8 @@ i40e_vsi_restore_mac_filter(struct i40e_vsi *vsi)\n \t\t\t\tvsi->vlan_num = 1;\n \t\t\t}\n \t\t\tvlan_num = vsi->vlan_num;\n-\t\t} else if ((f->mac_info.filter_type == RTE_MAC_PERFECT_MATCH) ||\n-\t\t\t (f->mac_info.filter_type == RTE_MAC_HASH_MATCH))\n+\t\t} else if (f->mac_info.filter_type == I40E_MAC_PERFECT_MATCH ||\n+\t\t\t f->mac_info.filter_type == I40E_MAC_HASH_MATCH)\n \t\t\tvlan_num = 1;\n \n \t\tmv_f = rte_zmalloc(\"macvlan_data\", vlan_num * sizeof(*mv_f), 0);\n@@ -303,8 +303,8 @@ i40e_vsi_restore_mac_filter(struct i40e_vsi *vsi)\n \t\t\t\t\t ETH_ADDR_LEN);\n \t\t}\n \n-\t\tif (f->mac_info.filter_type == RTE_MACVLAN_PERFECT_MATCH ||\n-\t\t f->mac_info.filter_type == RTE_MACVLAN_HASH_MATCH) {\n+\t\tif (f->mac_info.filter_type == I40E_MACVLAN_PERFECT_MATCH ||\n+\t\t f->mac_info.filter_type == I40E_MACVLAN_HASH_MATCH) {\n \t\t\tret = i40e_find_all_vlan_for_mac(vsi, mv_f, vlan_num,\n \t\t\t\t\t\t\t &f->mac_info.mac_addr);\n \t\t\tif (ret != I40E_SUCCESS) {\n@@ -768,7 +768,7 @@ int rte_pmd_i40e_set_vf_broadcast(uint16_t port, uint16_t vf_id,\n \n \tif (on) {\n \t\trte_memcpy(&filter.mac_addr, &broadcast, RTE_ETHER_ADDR_LEN);\n-\t\tfilter.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n+\t\tfilter.filter_type = I40E_MACVLAN_PERFECT_MATCH;\n \t\tret = i40e_vsi_add_mac(vsi, &filter);\n \t} else {\n \t\tret = i40e_vsi_delete_mac(vsi, &broadcast);\n@@ -2388,7 +2388,7 @@ rte_pmd_i40e_add_vf_mac_addr(uint16_t port, uint16_t vf_id,\n \t\treturn -EINVAL;\n \t}\n \n-\tmac_filter.filter_type = RTE_MACVLAN_PERFECT_MATCH;\n+\tmac_filter.filter_type = I40E_MACVLAN_PERFECT_MATCH;\n \trte_ether_addr_copy(mac_addr, &mac_filter.mac_addr);\n \tret = i40e_vsi_add_mac(vsi, &mac_filter);\n \tif (ret != I40E_SUCCESS) {\ndiff --git a/lib/librte_ethdev/rte_eth_ctrl.h b/lib/librte_ethdev/rte_eth_ctrl.h\nindex bbb94eccce..a3d49e0913 100644\n--- a/lib/librte_ethdev/rte_eth_ctrl.h\n+++ b/lib/librte_ethdev/rte_eth_ctrl.h\n@@ -56,17 +56,6 @@ enum rte_filter_op {\n \tRTE_ETH_FILTER_OP_MAX\n };\n \n-/**\n- * MAC filter type\n- */\n-enum rte_mac_filter_type {\n-\tRTE_MAC_PERFECT_MATCH = 1, /**< exact match of MAC addr. */\n-\tRTE_MACVLAN_PERFECT_MATCH, /**< exact match of MAC addr and VLAN ID. */\n-\tRTE_MAC_HASH_MATCH, /**< hash match of MAC addr. */\n-\t/** hash match of MAC addr and exact match of VLAN ID. */\n-\tRTE_MACVLAN_HASH_MATCH,\n-};\n-\n /**\n * Define all structures for Ethertype Filter type.\n */\n", "prefixes": [ "v2", "02/14" ] }