d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: fix flow counters using devx

Browse Source 
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.

Fixes: f5bf91de738a ("net/mlx5: support flow counters using devx")
Cc: stable@dpdk.org

Signed-off-by: Ori Kam <orika@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
This commit is contained in:
Ori Kam 2019-04-02 07:04:06 +00:00 committed by Ferruh Yigit
parent 13302cd5bd
commit f54aeb3ec0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/mlx5/Makefile
View File

@ -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 \

2
drivers/net/mlx5/meson.build
View File

@ -110,7 +110,7 @@ if build
[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
'mlx5dv_devx_obj_create' ],
[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
'MLX5DV_FLOW_ACTION_COUNTER_DEVX' ],
'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
'SUPPORTED_40000baseKR4_Full' ],
[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',

4
drivers/net/mlx5/mlx5_flow_dv.c
View File

@ -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 @@ flow_dv_translate(struct rte_eth_dev *dev,
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;