Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/82703/?format=api
{ "id": 82703, "url": "http://patches.dpdk.org/api/patches/82703/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1603957185-29309-1-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": "<1603957185-29309-1-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603957185-29309-1-git-send-email-arybchenko@solarflare.com", "date": "2020-10-29T07:39:45", "name": "common/sfc_efx/base: fix prefix in struct member names", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "42773cee096b7862626818eda76b9208024fc216", "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/1603957185-29309-1-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 13448, "url": "http://patches.dpdk.org/api/series/13448/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13448", "date": "2020-10-29T07:39:45", "name": "common/sfc_efx/base: fix prefix in struct member names", "version": 1, "mbox": "http://patches.dpdk.org/series/13448/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/82703/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/82703/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 56B4BA04B5;\n\tThu, 29 Oct 2020 08:40:11 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id B337CAA1F;\n\tThu, 29 Oct 2020 08:40:09 +0100 (CET)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id C9342A8E9\n for <dev@dpdk.org>; Thu, 29 Oct 2020 08:40:08 +0100 (CET)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.60])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n 46E7660083 for <dev@dpdk.org>; Thu, 29 Oct 2020 07:40:07 +0000 (UTC)", "from us4-mdac16-32.ut7.mdlocal (unknown [10.7.66.145])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 46E932009A\n for <dev@dpdk.org>; Thu, 29 Oct 2020 07:40:07 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.7.66.33])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n CD98E1C0052\n for <dev@dpdk.org>; Thu, 29 Oct 2020 07:40:05 +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 63B98A8006D\n for <dev@dpdk.org>; Thu, 29 Oct 2020 07:40:05 +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, 29 Oct 2020 07:40:01 +0000", "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, 29 Oct 2020 07:40:01 +0000", "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 09T7e1Pp021569;\n Thu, 29 Oct 2020 07:40:01 GMT", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 270A51613A9;\n Thu, 29 Oct 2020 07:40:01 +0000 (GMT)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Thu, 29 Oct 2020 07:39:45 +0000", "Message-ID": "<1603957185-29309-1-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.6.1012-25754.003", "X-TM-AS-Result": "No-0.157300-8.000000-10", "X-TMASE-MatchedRID": "uPMcGyNAiaYm5YKB3MVCSgGdJZ3Knh6hAp+UH372RZUZwGrh4y4izE90\n RLIMhJ7Dzt1QTyCqmMM3GtUOqefvamowheuziK0qLbjXqdzdtCV6i696PjRPiAaYevV4zG3ZQBz\n oPKhLasiT0DaWKLC6wECI2KYyvOZpLkCtrbHoRZqtIAhaF1t67zVfUuzvrtymR2YNIFh+clFCZn\n 37VQFgvdC5JUtUrWlZQyvM07liX/NiL/ws9tKSaRjDRPpHuqhaMHi1Ydy2WEiLun01yTNk6/6NZ\n thKIM9QD9pJQkNbenxKMuVi6C1rCh8TzIzimOwPC24oEZ6SpSmcfuxsiY4QFM1zIxTeJKy6WG9j\n FcOFqRMjaG10cEL9awdFGN5FHfdyYA6ggzVC6TSYNhBdZmPRIfBKEmEBFeCfZVprNhD1C+fPSv2\n PFxaH5eQDw6tgd3AMZ9iVj/KhX/RSnoQc5vb5zuQdkM7ndBLCYDttQUGqHZU=", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--0.157300-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25754.003", "X-MDID": "1603957206-1uW5rfdBUruo", "X-PPE-DISP": "1603957206;1uW5rfdBUruo", "Subject": "[dpdk-dev] [PATCH] common/sfc_efx/base: fix prefix in struct member\n\tnames", "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": "From: Ivan Malov <ivan.malov@oktetlabs.ru>\n\nIn libefx, a struct member name prefix is an abbreviation for the\nstruct name. Fix mismatch in the case of action set spec struct.\n\nFixes: aeacb8458950 (\"common/sfc_efx/base: support adding DELIVER action to set\")\nFixes: c73d314f790c (\"common/sfc_efx/base: support adding VLAN POP action to set\")\nFixes: 19aa67196d08 (\"common/sfc_efx/base: support adding VLAN PUSH action\")\nFixes: 633a89842c17 (\"common/sfc_efx/base: support adding MARK action to set\")\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/common/sfc_efx/base/efx_impl.h | 12 +++---\n drivers/common/sfc_efx/base/efx_mae.c | 52 +++++++++++++-------------\n 2 files changed, 32 insertions(+), 32 deletions(-)", "diff": "diff --git a/drivers/common/sfc_efx/base/efx_impl.h b/drivers/common/sfc_efx/base/efx_impl.h\nindex 75dbc84f71..94c730f4f5 100644\n--- a/drivers/common/sfc_efx/base/efx_impl.h\n+++ b/drivers/common/sfc_efx/base/efx_impl.h\n@@ -1758,14 +1758,14 @@ typedef struct efx_mae_action_vlan_push_s {\n \n struct efx_mae_actions_s {\n \t/* Bitmap of actions in spec, indexed by action type */\n-\tuint32_t\t\t\temass_actions;\n+\tuint32_t\t\t\tema_actions;\n \n-\tunsigned int\t\t\temass_n_vlan_tags_to_pop;\n-\tunsigned int\t\t\temass_n_vlan_tags_to_push;\n-\tefx_mae_action_vlan_push_t\temass_vlan_push_descs[\n+\tunsigned int\t\t\tema_n_vlan_tags_to_pop;\n+\tunsigned int\t\t\tema_n_vlan_tags_to_push;\n+\tefx_mae_action_vlan_push_t\tema_vlan_push_descs[\n \t EFX_MAE_VLAN_PUSH_MAX_NTAGS];\n-\tuint32_t\t\t\temass_mark_value;\n-\tefx_mport_sel_t\t\t\temass_deliver_mport;\n+\tuint32_t\t\t\tema_mark_value;\n+\tefx_mport_sel_t\t\t\tema_deliver_mport;\n };\n \n #endif /* EFSYS_OPT_MAE */\ndiff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c\nindex fbf56b14ce..0cf1e0557d 100644\n--- a/drivers/common/sfc_efx/base/efx_mae.c\n+++ b/drivers/common/sfc_efx/base/efx_mae.c\n@@ -928,12 +928,12 @@ efx_mae_action_set_add_vlan_pop(\n \t\tgoto fail2;\n \t}\n \n-\tif (spec->emass_n_vlan_tags_to_pop == EFX_MAE_VLAN_POP_MAX_NTAGS) {\n+\tif (spec->ema_n_vlan_tags_to_pop == EFX_MAE_VLAN_POP_MAX_NTAGS) {\n \t\trc = ENOTSUP;\n \t\tgoto fail3;\n \t}\n \n-\t++spec->emass_n_vlan_tags_to_pop;\n+\t++(spec->ema_n_vlan_tags_to_pop);\n \n \treturn (0);\n \n@@ -952,10 +952,10 @@ efx_mae_action_set_add_vlan_push(\n \t__in\t\t\t\tsize_t arg_size,\n \t__in_bcount(arg_size)\t\tconst uint8_t *arg)\n {\n-\tunsigned int n_tags = spec->emass_n_vlan_tags_to_push;\n+\tunsigned int n_tags = spec->ema_n_vlan_tags_to_push;\n \tefx_rc_t rc;\n \n-\tif (arg_size != sizeof (*spec->emass_vlan_push_descs)) {\n+\tif (arg_size != sizeof (*spec->ema_vlan_push_descs)) {\n \t\trc = EINVAL;\n \t\tgoto fail1;\n \t}\n@@ -970,8 +970,8 @@ efx_mae_action_set_add_vlan_push(\n \t\tgoto fail3;\n \t}\n \n-\tmemcpy(&spec->emass_vlan_push_descs[n_tags], arg, arg_size);\n-\t++(spec->emass_n_vlan_tags_to_push);\n+\tmemcpy(&spec->ema_vlan_push_descs[n_tags], arg, arg_size);\n+\t++(spec->ema_n_vlan_tags_to_push);\n \n \treturn (0);\n \n@@ -1023,7 +1023,7 @@ efx_mae_action_set_add_mark(\n {\n \tefx_rc_t rc;\n \n-\tif (arg_size != sizeof (spec->emass_mark_value)) {\n+\tif (arg_size != sizeof (spec->ema_mark_value)) {\n \t\trc = EINVAL;\n \t\tgoto fail1;\n \t}\n@@ -1033,7 +1033,7 @@ efx_mae_action_set_add_mark(\n \t\tgoto fail2;\n \t}\n \n-\tmemcpy(&spec->emass_mark_value, arg, arg_size);\n+\tmemcpy(&spec->ema_mark_value, arg, arg_size);\n \n \treturn (0);\n \n@@ -1052,7 +1052,7 @@ efx_mae_action_set_add_deliver(\n {\n \tefx_rc_t rc;\n \n-\tif (arg_size != sizeof (spec->emass_deliver_mport)) {\n+\tif (arg_size != sizeof (spec->ema_deliver_mport)) {\n \t\trc = EINVAL;\n \t\tgoto fail1;\n \t}\n@@ -1062,7 +1062,7 @@ efx_mae_action_set_add_deliver(\n \t\tgoto fail2;\n \t}\n \n-\tmemcpy(&spec->emass_deliver_mport, arg, arg_size);\n+\tmemcpy(&spec->ema_deliver_mport, arg, arg_size);\n \n \treturn (0);\n \n@@ -1149,7 +1149,7 @@ efx_mae_action_set_spec_populate(\n \n \taction_mask = (1U << type);\n \n-\tif ((spec->emass_actions & action_mask) != 0) {\n+\tif ((spec->ema_actions & action_mask) != 0) {\n \t\t/* The action set already contains this action. */\n \t\tif ((efx_mae_action_repeat_map & action_mask) == 0) {\n \t\t\t/* Cannot add another non-repeatable action. */\n@@ -1164,7 +1164,7 @@ efx_mae_action_set_spec_populate(\n \t\tuint32_t later_actions_mask =\n \t\t strict_ordered_map & ~(action_mask | (action_mask - 1));\n \n-\t\tif ((spec->emass_actions & later_actions_mask) != 0) {\n+\t\tif ((spec->ema_actions & later_actions_mask) != 0) {\n \t\t\t/* Cannot add an action after later ordered actions. */\n \t\t\trc = ENOTSUP;\n \t\t\tgoto fail3;\n@@ -1177,7 +1177,7 @@ efx_mae_action_set_spec_populate(\n \t\t\tgoto fail4;\n \t}\n \n-\tspec->emass_actions |= action_mask;\n+\tspec->ema_actions |= action_mask;\n \n \treturn (0);\n \n@@ -1622,48 +1622,48 @@ efx_mae_action_set_alloc(\n \t MAE_ACTION_SET_ALLOC_IN_ENCAP_HEADER_ID, EFX_MAE_RSRC_ID_INVALID);\n \n \tMCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,\n-\t MAE_ACTION_SET_ALLOC_IN_VLAN_POP, spec->emass_n_vlan_tags_to_pop);\n+\t MAE_ACTION_SET_ALLOC_IN_VLAN_POP, spec->ema_n_vlan_tags_to_pop);\n \n-\tif (spec->emass_n_vlan_tags_to_push > 0) {\n+\tif (spec->ema_n_vlan_tags_to_push > 0) {\n \t\tunsigned int outer_tag_idx;\n \n \t\tMCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,\n \t\t MAE_ACTION_SET_ALLOC_IN_VLAN_PUSH,\n-\t\t spec->emass_n_vlan_tags_to_push);\n+\t\t spec->ema_n_vlan_tags_to_push);\n \n-\t\tif (spec->emass_n_vlan_tags_to_push ==\n+\t\tif (spec->ema_n_vlan_tags_to_push ==\n \t\t EFX_MAE_VLAN_PUSH_MAX_NTAGS) {\n \t\t\tMCDI_IN_SET_WORD(req,\n \t\t\t MAE_ACTION_SET_ALLOC_IN_VLAN1_PROTO_BE,\n-\t\t\t spec->emass_vlan_push_descs[0].emavp_tpid_be);\n+\t\t\t spec->ema_vlan_push_descs[0].emavp_tpid_be);\n \t\t\tMCDI_IN_SET_WORD(req,\n \t\t\t MAE_ACTION_SET_ALLOC_IN_VLAN1_TCI_BE,\n-\t\t\t spec->emass_vlan_push_descs[0].emavp_tci_be);\n+\t\t\t spec->ema_vlan_push_descs[0].emavp_tci_be);\n \t\t}\n \n-\t\touter_tag_idx = spec->emass_n_vlan_tags_to_push - 1;\n+\t\touter_tag_idx = spec->ema_n_vlan_tags_to_push - 1;\n \n \t\tMCDI_IN_SET_WORD(req, MAE_ACTION_SET_ALLOC_IN_VLAN0_PROTO_BE,\n-\t\t spec->emass_vlan_push_descs[outer_tag_idx].emavp_tpid_be);\n+\t\t spec->ema_vlan_push_descs[outer_tag_idx].emavp_tpid_be);\n \t\tMCDI_IN_SET_WORD(req, MAE_ACTION_SET_ALLOC_IN_VLAN0_TCI_BE,\n-\t\t spec->emass_vlan_push_descs[outer_tag_idx].emavp_tci_be);\n+\t\t spec->ema_vlan_push_descs[outer_tag_idx].emavp_tci_be);\n \t}\n \n-\tif ((spec->emass_actions & (1U << EFX_MAE_ACTION_FLAG)) != 0) {\n+\tif ((spec->ema_actions & (1U << EFX_MAE_ACTION_FLAG)) != 0) {\n \t\tMCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,\n \t\t MAE_ACTION_SET_ALLOC_IN_FLAG, 1);\n \t}\n \n-\tif ((spec->emass_actions & (1U << EFX_MAE_ACTION_MARK)) != 0) {\n+\tif ((spec->ema_actions & (1U << EFX_MAE_ACTION_MARK)) != 0) {\n \t\tMCDI_IN_SET_DWORD_FIELD(req, MAE_ACTION_SET_ALLOC_IN_FLAGS,\n \t\t MAE_ACTION_SET_ALLOC_IN_MARK, 1);\n \n \t\tMCDI_IN_SET_DWORD(req,\n-\t\t MAE_ACTION_SET_ALLOC_IN_MARK_VALUE, spec->emass_mark_value);\n+\t\t MAE_ACTION_SET_ALLOC_IN_MARK_VALUE, spec->ema_mark_value);\n \t}\n \n \tMCDI_IN_SET_DWORD(req,\n-\t MAE_ACTION_SET_ALLOC_IN_DELIVER, spec->emass_deliver_mport.sel);\n+\t MAE_ACTION_SET_ALLOC_IN_DELIVER, spec->ema_deliver_mport.sel);\n \n \tMCDI_IN_SET_DWORD(req, MAE_ACTION_SET_ALLOC_IN_SRC_MAC_ID,\n \t MC_CMD_MAE_MAC_ADDR_ALLOC_OUT_MAC_ID_NULL);\n", "prefixes": [] }