From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A87C0A0548; Thu, 11 Nov 2021 17:23:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3ED8040E28; Thu, 11 Nov 2021 17:23:25 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061.outbound.protection.outlook.com [40.107.94.61]) by mails.dpdk.org (Postfix) with ESMTP id 1473F40E03 for ; Thu, 11 Nov 2021 17:23:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OdAX+FqE9zfA1tY0c6RlgZzVujdeSiG2s38pyQShBAli9R/wDsZh+SbxlsRsBYQmAGvLbhaAQA80Dn6MNxaYUCbvB3NW6G35tMmu18HU1C33cP/Ks4ErSnwaqomTDd81nmepkUE9yZpJ9TeQpDl7pIjS7vYYWvG2DAv/x4IYoA2ENAmDGOa3ahv5urwMvwuvCkeXlZDFVerrOXx2fiba/wqgEiXmzAefEq6eQA6xLyQGv9AWH0wE1vXU4I+kc3O8fnjQIuQFQQTx8iJeKGTquuf9ZhGze0GKZLDBlfaVwgjE8qr8vA/oFcRwp/m7nqA6yLTtTRaoc6AsVDhhQz/SQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=O3MMi78hhNQk/Mn1zvBJOMk3H2EnmjrCqAPjxBhAhY0=; b=FWtTBQoBjAmhDZTnLXx8IKlXiPpxcTWtaSpCB216tVwJvrc+1l1Ar+IUncK9jj/Y/xQs9KtW03NExWflU2ZlsxK6TRkfUyB7LBfU0+3qeBfnQ9X2EHjRcUUJAG84l8HsJtVopH2akazk8InDHNuHxeuW2ktpyvMcwD2USIv1EA73+eXLGx7Wv+SEd5bet9gnxIcGm34HxFR0ycDrG0gXRrHVxbbDiGZZ3PZivVzOexz22LtYNojDYuVPk2TEaPBUnQxwny/vqAGWF/MJh2riO96GCbRFg+Qy/8kscuBRXePa/KE9iyv2yknVmPP2GL5A0WneG28KK+Ty1Vg5UuHkHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=O3MMi78hhNQk/Mn1zvBJOMk3H2EnmjrCqAPjxBhAhY0=; b=aEegOzagOtjrs8QftxSLnclo2o0wqYJJ9oj/nssqjEv6cCc4cHErOMY+1MbZBrFILdIiKc3smq3tF/I8NBFzZSInyaRGIoWZG7+7h69ZqQBp1PmN0Ij6T5vPC+ucfdoBopm5ygwIp1MYH6miGsoC2KZd92Yt3DBSd7axi+9KEfQVMMLXzAI2v9Lf1j7TB+4iWACdZrtreKpHc+hSjinkSZDEFAw2S1bOjLs0/6ZEJLoNMFwNgNuqU7rlQK8thV9+ZLESaeRsBxyEG5HNryMr27xnzmEggopR5K+aq1I9jsy4bifSTcs3V4RakUT5HCH0U42mrwKQlNIm478EmI/mLg== Received: from DS7PR06CA0003.namprd06.prod.outlook.com (2603:10b6:8:2a::27) by DM5PR12MB2519.namprd12.prod.outlook.com (2603:10b6:4:b5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.17; Thu, 11 Nov 2021 16:23:21 +0000 Received: from DM6NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2a:cafe::9c) by DS7PR06CA0003.outlook.office365.com (2603:10b6:8:2a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Thu, 11 Nov 2021 16:23:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT036.mail.protection.outlook.com (10.13.172.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Thu, 11 Nov 2021 16:23:21 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 11 Nov 2021 16:23:19 +0000 From: Gregory Etelson To: , , CC: Matan Azrad Subject: [PATCH] net/mlx5: fix flex item macro collision Date: Thu, 11 Nov 2021 18:23:04 +0200 Message-ID: <20211111162305.10883-1-getelson@nvidia.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff921362-0999-4423-d3d4-08d9a52f93f5 X-MS-TrafficTypeDiagnostic: DM5PR12MB2519: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1388; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: skt2bxDGiGkx1jdJiEXY92tqvOLoj9c3DnGfIqxaBkv67D7sAHaMvVYSUtfXMSSbQvnZDhDX5rWd8vataXqEDKszEXZvQYHUU+BE9uvibsgV4XUju2ECYGFBHuC5OeogEn5p01+V665ITMEeBNrBqPgV/hLtRZa8TKJzI+upWXIOt00jRQxvpKL183Bj+MRBr2DyYW5os0TjrY/D3nF4wpAuz1Dv+dlf7PNlALfzq1FmLn8/nzJiVjRnRtca0FMc//Ig5ZE4vUGA/l52GH07OKC90DwetpEG8ChMrQ5Iz09fntVy8ArmeiTfGRYlMr/BbzUtThMmRaOBGpzNFp9shrDu3TTIlWgW+sVCcvzNCun5gUm96+ijWJHUGBs+j/Pu7GaaGYiHHj/oFEPYM8l0LO1PXX1WCkkN2k4Oiua4g1XW1LFlXicy8vp/AonlMCGvL6bj5tLfRWSAL7AcJ9izKyEBVcURCnmnQ27oW1EXZEkliQBhTT65SCZKPAX1aqVPlLHgQWC4g2/ZGm9peEqHDBi0D4o+LxwtfFdCjqdBecNlrn3QQWcNBwvkluvJr0z2UKnRYpGWtHM2cqqKs2KYvsz3+kVglgdKXi4al8eqT0dDdQIZ1p9v/2klW8bb9GT914p0HmUzDXNTZ8LNXLr2XTP1P43G3CY9aw7aUJhrkO0ELsqIy3KxdBmIIBSYv2dImsnMlalLUfYX85GEqg5VVQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6666004)(107886003)(55016002)(82310400003)(2906002)(316002)(36860700001)(110136005)(6636002)(70206006)(36756003)(86362001)(16526019)(36906005)(6286002)(1076003)(83380400001)(508600001)(356005)(336012)(186003)(2616005)(5660300002)(4326008)(70586007)(26005)(7636003)(8676002)(8936002)(7696005)(47076005)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2021 16:23:21.3083 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff921362-0999-4423-d3d4-08d9a52f93f5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2519 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Flex item macro definition values duplicated existing connection tracking values. The patch provides new values for flex item macros. Fixes: a23e9b6e3ee9 ("net/mlx5: handle flex item in flows") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 696d294ca5..1de2f2edb0 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -181,9 +181,9 @@ enum mlx5_feature_name { #define MLX5_FLOW_LAYER_ASO_CT (UINT64_C(1) << 36) /* Flex item */ -#define MLX5_FLOW_ITEM_OUTER_FLEX (UINT64_C(1) << 36) -#define MLX5_FLOW_ITEM_INNER_FLEX (UINT64_C(1) << 37) -#define MLX5_FLOW_ITEM_FLEX_TUNNEL (UINT64_C(1) << 38) +#define MLX5_FLOW_ITEM_OUTER_FLEX (UINT64_C(1) << 37) +#define MLX5_FLOW_ITEM_INNER_FLEX (UINT64_C(1) << 38) +#define MLX5_FLOW_ITEM_FLEX_TUNNEL (UINT64_C(1) << 39) /* Outer Masks. */ #define MLX5_FLOW_LAYER_OUTER_L3 \ -- 2.33.1