From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 7DAE5A0679
for <public@inbox.dpdk.org>; Mon, 1 Apr 2019 17:27:53 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id F0DE33572;
Mon, 1 Apr 2019 17:27:51 +0200 (CEST)
Received: from EUR02-VE1-obe.outbound.protection.outlook.com
(mail-eopbgr20083.outbound.protection.outlook.com [40.107.2.83])
by dpdk.org (Postfix) with ESMTP id E5EF834F3
for <dev@dpdk.org>; Mon, 1 Apr 2019 17:27:50 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=WTCpEzTe0r3b9o1AAFB5frJw1q1rsl/7E3zevDQ6rgA=;
b=AlJT8qbJGlkQAA4N+6NHSdnjM7j/wlUpC8/ZMdnuKlOct9LhqUi+Q6VHJUiYbD9XTkJ878IF4FnOe6pE+fWHp5kGeb9KAh7pLi4x1sHlOiumINPwDIs+bPKZFNX3soHu1P+tmkhlg65EqeVwHyuwS9kkvb+rBXSY0lfYk4s2ols=
Received: from AM4PR05MB3425.eurprd05.prod.outlook.com (10.171.190.15) by
AM4PR05MB3476.eurprd05.prod.outlook.com (10.171.187.157) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.1750.15; Mon, 1 Apr 2019 15:27:49 +0000
Received: from AM4PR05MB3425.eurprd05.prod.outlook.com
([fe80::5df0:22de:97f0:3827]) by AM4PR05MB3425.eurprd05.prod.outlook.com
([fe80::5df0:22de:97f0:3827%4]) with mapi id 15.20.1750.014; Mon, 1 Apr 2019
15:27:49 +0000
From: Ori Kam <orika@mellanox.com>
To: Matan Azrad <matan@mellanox.com>, Yongseok Koh <yskoh@mellanox.com>,
Shahaf Shuler <shahafs@mellanox.com>
CC: "dev@dpdk.org" <dev@dpdk.org>, Ori Kam <orika@mellanox.com>
Thread-Topic: [PATCH] net/mlx5: update counter API for upstream
Thread-Index: AQHU6J92Rwis6tZNpUik7rG7SD6M+g==
Date: Mon, 1 Apr 2019 15:27:49 +0000
Message-ID: <1554132458-176151-1-git-send-email-orika@mellanox.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-clientproxiedby: LO2P265CA0367.GBRP265.PROD.OUTLOOK.COM
(2603:10a6:600:a3::19) To AM4PR05MB3425.eurprd05.prod.outlook.com
(2603:10a6:205:b::15)
authentication-results: spf=none (sender IP is )
smtp.mailfrom=orika@mellanox.com;
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 1.8.3.1
x-originating-ip: [37.142.13.130]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 90824534-fb83-43ad-ce6d-08d6b6b6991d
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0; PCL:0;
RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);
SRVR:AM4PR05MB3476;
x-ms-traffictypediagnostic: AM4PR05MB3476:
x-microsoft-antispam-prvs: <AM4PR05MB34764A357C9FFB8EACA12C5BDB550@AM4PR05MB3476.eurprd05.prod.outlook.com>
x-forefront-prvs: 0994F5E0C5
x-forefront-antispam-report: SFV:NSPM;
SFS:(10009020)(396003)(136003)(366004)(39860400002)(376002)(346002)(189003)(199004)(71200400001)(36756003)(81166006)(15650500001)(102836004)(305945005)(86362001)(6636002)(478600001)(3846002)(66066001)(6116002)(53936002)(6512007)(14454004)(4720700003)(97736004)(8936002)(50226002)(8676002)(81156014)(316002)(6486002)(99286004)(4326008)(68736007)(186003)(105586002)(54906003)(25786009)(106356001)(110136005)(6436002)(2906002)(386003)(5660300002)(71190400001)(256004)(26005)(107886003)(476003)(486006)(6506007)(2616005)(52116002)(7736002);
DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR05MB3476;
H:AM4PR05MB3425.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en;
PTR:InfoNoRecords; MX:1; A:1;
received-spf: None (protection.outlook.com: mellanox.com does not designate
permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: 8TzLVX7RneOTDajCq2caNY8ERydcN7OQlhzZEa8fzfiUBPdmODwSj4J8sXEXvL1xd01KffM7cyc8ZBkcpYXnvMA2NYXPpBzdaG94tRAktq8ujMkzVkUvUXBDfVljpWBW/6/E6MB0bm5FX7ahaGTJ0OM3d5sZs3A8x4Ha3NxGcX7o75+0Xu2amQX97EjCvhe41h76492BM+VH8LFau5H//udpNjyrVuVi+IoU6adzoK+DxE24VT6Ikvfiyne6VsG60XWsg3g+l/y+eEh/UMGsdzlqAibe3B4SGx0N/oXt1yKEr4sLqMSqPKA5Rrqu6cw2rTE9JsBvDs9kKmlGZ5+Ed8+fhaYlvlVmGbd7yJH+rzeWP5/dU7CSFCA+Lv4bwfzK14ZFqtSjgCXu06du4Yy3bw6jHNsuvcyf/E4859U2NNM=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 90824534-fb83-43ad-ce6d-08d6b6b6991d
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2019 15:27:49.2386 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR05MB3476
Subject: [dpdk-dev] [PATCH] net/mlx5: update counter API for upstream
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Message-ID: <20190401152749.dmYn1yQU8-qX64qghdJD1FD387rFiBA6epbo2RFoSMc@z>
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.
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_d=
v.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
=20
#ifndef HAVE_IBV_FLOW_DEVX_COUNTERS
-#define MLX5DV_FLOW_ACTION_COUNTER_DEVX 0
+#define MLX5DV_FLOW_ACTION_COUNTERS_DEVX 0
#endif
=20
union flow_dv_attr {
@@ -2939,7 +2939,7 @@ struct field_modify_info modify_tcp[] =3D {
if (flow->counter =3D=3D NULL)
goto cnt_err;
dev_flow->dv.actions[actions_n].type =3D
- MLX5DV_FLOW_ACTION_COUNTER_DEVX;
+ MLX5DV_FLOW_ACTION_COUNTERS_DEVX;
dev_flow->dv.actions[actions_n].obj =3D
flow->counter->dcs->obj;
action_flags |=3D MLX5_FLOW_ACTION_COUNT;
--=20
1.8.3.1