From: Shahaf Shuler <shahafs@mellanox.com>
To: Ori Kam <orika@mellanox.com>, Matan Azrad <matan@mellanox.com>,
Yongseok Koh <yskoh@mellanox.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] net/mlx5: update counter API for upstream
Date: Tue, 2 Apr 2019 04:56:33 +0000 [thread overview]
Message-ID: <AM0PR0502MB379501FCCDCF18AE4A48BFC9C3560@AM0PR0502MB3795.eurprd05.prod.outlook.com> (raw)
Message-ID: <20190402045633.b79leaUa1m_JVSQftRES80jpJgyXIw0JOIqTDYTRep4@z> (raw)
In-Reply-To: <1554132458-176151-1-git-send-email-orika@mellanox.com>
Hi Ori,
Monday, April 1, 2019 6:28 PM, Ori Kam:
> Subject: [PATCH] net/mlx5: update counter API for upstream
This is not an update, this is a fix.
>
> The API that was defined in OFED 4.5 was replaced both in OFED 4.6 and in
> upstream.
>
> This commit updates the API to match the upstream one.
Need to add Cc stable + the offending commit which caused the issue.
>
> Signed-off-by: Ori Kam <orika@mellanox.com>
> ---
> drivers/net/mlx5/Makefile | 2 +-
> drivers/net/mlx5/mlx5_flow_dv.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index
> c326494..671fdb8 100644
> --- a/drivers/net/mlx5/Makefile
> +++ b/drivers/net/mlx5/Makefile
> @@ -163,7 +163,7 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-
> config-h.sh
> $Q sh -- '$<' '$@' \
> HAVE_IBV_FLOW_DEVX_COUNTERS \
> infiniband/mlx5dv.h \
> - enum MLX5DV_FLOW_ACTION_COUNTER_DEVX \
> + enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \
> $(AUTOCONF_OUTPUT)
> $Q sh -- '$<' '$@' \
> HAVE_ETHTOOL_LINK_MODE_25G \
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index 57847fb..2fe2836 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -36,7 +36,7 @@
> #ifdef HAVE_IBV_FLOW_DV_SUPPORT
>
> #ifndef HAVE_IBV_FLOW_DEVX_COUNTERS
> -#define MLX5DV_FLOW_ACTION_COUNTER_DEVX 0
> +#define MLX5DV_FLOW_ACTION_COUNTERS_DEVX 0
> #endif
>
> union flow_dv_attr {
> @@ -2939,7 +2939,7 @@ struct field_modify_info modify_tcp[] = {
> if (flow->counter == NULL)
> goto cnt_err;
> dev_flow->dv.actions[actions_n].type =
> -
> MLX5DV_FLOW_ACTION_COUNTER_DEVX;
> +
> MLX5DV_FLOW_ACTION_COUNTERS_DEVX;
> dev_flow->dv.actions[actions_n].obj =
> flow->counter->dcs->obj;
> action_flags |= MLX5_FLOW_ACTION_COUNT;
> --
> 1.8.3.1
next prev parent reply other threads:[~2019-04-02 4:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 15:27 Ori Kam
2019-04-01 15:27 ` Ori Kam
2019-04-02 4:56 ` Shahaf Shuler [this message]
2019-04-02 4:56 ` Shahaf Shuler
2019-04-02 5:24 ` Ori Kam
2019-04-02 5:24 ` Ori Kam
2019-04-02 5:32 ` Shahaf Shuler
2019-04-02 5:32 ` Shahaf Shuler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AM0PR0502MB379501FCCDCF18AE4A48BFC9C3560@AM0PR0502MB3795.eurprd05.prod.outlook.com \
--to=shahafs@mellanox.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--cc=orika@mellanox.com \
--cc=yskoh@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).