From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 71692A053D; Fri, 17 Jul 2020 11:55:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2874A1BFFD; Fri, 17 Jul 2020 11:55:09 +0200 (CEST) Received: from relay.smtp.broadcom.com (unknown [192.19.232.149]) by dpdk.org (Postfix) with ESMTP id 464C61BFE4 for ; Fri, 17 Jul 2020 11:55:01 +0200 (CEST) Received: from dhcp-10-123-153-55.dhcp.broadcom.net (dhcp-10-123-153-55.dhcp.broadcom.net [10.123.153.55]) by relay.smtp.broadcom.com (Postfix) with ESMTP id DF7131BBCD0; Fri, 17 Jul 2020 02:55:00 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com DF7131BBCD0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1594979701; bh=fTHmNmI6w0eTRSSd08SuWL9BWu7UjWuKAPgf/1zdIZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LPcprdrWr1ZhM9IiLBQewWJ/njzouszaIV3Wh/+T1LjygEKle1YH7HsEAXuFrx50W vd2EYBaSJvDw5Hn4KX3H63zuJe1JiPFWxsGqnjweZVjg74IuQhQ128dLBDCmqv/MGg plWEh4/6B1h7eze94TusX/ZEvQuu0WBU2Vv8EAkY= From: Somnath Kotur To: dev@dpdk.org Cc: ferruh.yigit@intel.com Date: Fri, 17 Jul 2020 15:19:28 +0530 Message-Id: <20200717094935.9337-8-somnath.kotur@broadcom.com> X-Mailer: git-send-email 2.10.1.613.g2cc2e70 In-Reply-To: <20200717094935.9337-1-somnath.kotur@broadcom.com> References: <20200717094935.9337-1-somnath.kotur@broadcom.com> Subject: [dpdk-dev] [PATCH 07/14] net/bnxt: replace NAT IPv4 action SRC/DEST X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Jay Ding Use NAT IPv4 instead of NAT IPv4 SRC and DST. Signed-off-by: Jay Ding Reviewed-by: Kishore Padmanabha Signed-off-by: Somnath Kotur --- drivers/net/bnxt/tf_core/tf_core.h | 4 +--- drivers/net/bnxt/tf_core/tf_device_p4.h | 1 - drivers/net/bnxt/tf_core/tf_util.c | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/tf_core/tf_core.h b/drivers/net/bnxt/tf_core/tf_core.h index 8fa734a..67415ad 100644 --- a/drivers/net/bnxt/tf_core/tf_core.h +++ b/drivers/net/bnxt/tf_core/tf_core.h @@ -228,9 +228,7 @@ enum tf_tbl_type { /** Wh+/SR Action Modify L4 Dest Port */ TF_TBL_TYPE_ACT_MODIFY_DPORT, /** Wh+/SR Action Modify IPv4 Source */ - TF_TBL_TYPE_ACT_MODIFY_IPV4_SRC, - /** Wh+/SR Action _Modify L4 Dest Port */ - TF_TBL_TYPE_ACT_MODIFY_IPV4_DEST, + TF_TBL_TYPE_ACT_MODIFY_IPV4, /** Meter Profiles */ TF_TBL_TYPE_METER_PROF, /** Meter Instance */ diff --git a/drivers/net/bnxt/tf_core/tf_device_p4.h b/drivers/net/bnxt/tf_core/tf_device_p4.h index 06c3ecf..7e58469 100644 --- a/drivers/net/bnxt/tf_core/tf_device_p4.h +++ b/drivers/net/bnxt/tf_core/tf_device_p4.h @@ -50,7 +50,6 @@ struct tf_rm_element_cfg tf_tbl_p4[TF_TBL_TYPE_MAX] = { { TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_PORT }, { TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_PORT }, { TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_IPV4 }, - { TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_NAT_IPV4 }, { TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_METER_PROF }, { TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_METER }, { TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P4_MIRROR }, diff --git a/drivers/net/bnxt/tf_core/tf_util.c b/drivers/net/bnxt/tf_core/tf_util.c index bf6a6a3..34f4305 100644 --- a/drivers/net/bnxt/tf_core/tf_util.c +++ b/drivers/net/bnxt/tf_core/tf_util.c @@ -92,10 +92,8 @@ tf_tbl_type_2_str(enum tf_tbl_type tbl_type) return "NAT Source Port"; case TF_TBL_TYPE_ACT_MODIFY_DPORT: return "NAT Destination Port"; - case TF_TBL_TYPE_ACT_MODIFY_IPV4_SRC: - return "NAT IPv4 Source"; - case TF_TBL_TYPE_ACT_MODIFY_IPV4_DEST: - return "NAT IPv4 Destination"; + case TF_TBL_TYPE_ACT_MODIFY_IPV4: + return "NAT IPv4"; case TF_TBL_TYPE_METER_PROF: return "Meter Profile"; case TF_TBL_TYPE_METER_INST: -- 2.7.4