From patchwork Wed Oct 23 08:51:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 61710 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4987F1BFE2; Wed, 23 Oct 2019 10:52:18 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 4DA1D1BFDB for ; Wed, 23 Oct 2019 10:52:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571820734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6F7DVNelGhFutVjvx67Tm8nbZTgKSuy5/4B0eTBXaYE=; b=K5k8wGTn1ixLZ8nidI5YlvxafIr1uBBts9JsPzGW7j2AaNYhLE83DjcjjmW4rzwCcYCxA+ FqDAutTWKP1EDrsx/nVYI7olyqrYYAbVmFzWv+ksXD7HKzkayebUQoCrKVAYozjudBzrr/ xfykedBszwG6CuNjPKcURBYd7nrtGZc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-241-LfmOb5APMTeo_Vn06mrMHA-1; Wed, 23 Oct 2019 04:52:11 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 576851005509; Wed, 23 Oct 2019 08:52:10 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-129.brq.redhat.com [10.40.204.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFD9819C70; Wed, 23 Oct 2019 08:52:08 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: olivier.matz@6wind.com, ferruh.yigit@intel.com, stable@dpdk.org Date: Wed, 23 Oct 2019 10:51:56 +0200 Message-Id: <1571820718-7021-2-git-send-email-david.marchand@redhat.com> In-Reply-To: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> References: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: LfmOb5APMTeo_Vn06mrMHA-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [PATCH 1/3] net: add missing rte prefix on PPPoE defines 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" Those two defines have been missed. Fixes: 35b2d13fd6fd ("net: add rte prefix to ether defines") Cc: stable@dpdk.org Signed-off-by: David Marchand --- lib/librte_net/rte_ether.h | 4 ++-- lib/librte_pipeline/rte_table_action.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index aca56aa..29d80ab 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -302,8 +302,8 @@ struct rte_vxlan_hdr { #define RTE_ETHER_TYPE_RARP 0x8035 /**< Reverse Arp Protocol. */ #define RTE_ETHER_TYPE_VLAN 0x8100 /**< IEEE 802.1Q VLAN tagging. */ #define RTE_ETHER_TYPE_QINQ 0x88A8 /**< IEEE 802.1ad QinQ tagging. */ -#define ETHER_TYPE_PPPOE_DISCOVERY 0x8863 /**< PPPoE Discovery Stage. */ -#define ETHER_TYPE_PPPOE_SESSION 0x8864 /**< PPPoE Session Stage. */ +#define RTE_ETHER_TYPE_PPPOE_DISCOVERY 0x8863 /**< PPPoE Discovery Stage. */ +#define RTE_ETHER_TYPE_PPPOE_SESSION 0x8864 /**< PPPoE Session Stage. */ #define RTE_ETHER_TYPE_ETAG 0x893F /**< IEEE 802.1BR E-Tag. */ #define RTE_ETHER_TYPE_1588 0x88F7 /**< IEEE 802.1AS 1588 Precise Time Protocol. */ diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c index 47d7efb..45dde71 100644 --- a/lib/librte_pipeline/rte_table_action.c +++ b/lib/librte_pipeline/rte_table_action.c @@ -696,7 +696,7 @@ encap_qinq_pppoe_apply(void *data, d->cvlan.vlan_tci = rte_htons(VLAN(p->qinq.cvlan.pcp, p->qinq.cvlan.dei, p->qinq.cvlan.vid)); - d->cvlan.eth_proto = rte_htons(ETHER_TYPE_PPPOE_SESSION); + d->cvlan.eth_proto = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION); /* PPPoE and PPP*/ d->pppoe_ppp.ver_type_code = rte_htons(0x1100); @@ -747,7 +747,7 @@ encap_pppoe_apply(void *data, /* Ethernet */ rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr); rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr); - d->ether.ether_type = rte_htons(ETHER_TYPE_PPPOE_SESSION); + d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION); /* PPPoE and PPP*/ d->pppoe_ppp.ver_type_code = rte_htons(0x1100); From patchwork Wed Oct 23 08:51:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 61711 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E11011BFF8; Wed, 23 Oct 2019 10:52:21 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 5AA0E1BFE1 for ; Wed, 23 Oct 2019 10:52:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571820736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zH2ulEkB4FMeDrcn8Pd7DKSx4ldhrBeH/Eukh6FQbKA=; b=Ti3C3+AFJYLMf41rVVkQzNAekClwYeNfz6IarZ0RGOJSCuHIkSlFYf8qgeu/ZU/iIPYccL pdohxDJSx7MoQbz4Xo8rrgGPIEF1dsMSHUp9oZH+3M1U78uiCWXVp7zOgp/GFYlACokcvS R7FBFNVVYCt/OgnZb6udWPnHoPZ/YC8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-UhPuuFQ5OiaUMYnDAq3SNw-1; Wed, 23 Oct 2019 04:52:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D22C800D49; Wed, 23 Oct 2019 08:52:12 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-129.brq.redhat.com [10.40.204.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4B691D9; Wed, 23 Oct 2019 08:52:10 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: olivier.matz@6wind.com, ferruh.yigit@intel.com, stable@dpdk.org Date: Wed, 23 Oct 2019 10:51:57 +0200 Message-Id: <1571820718-7021-3-git-send-email-david.marchand@redhat.com> In-Reply-To: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> References: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: UhPuuFQ5OiaUMYnDAq3SNw-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [PATCH 2/3] net: add rte prefix to MPLS structure 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" Add 'rte_' prefix to structures: - rename struct mpls_hdr as struct rte_mpls_hdr. Cc: stable@dpdk.org Signed-off-by: David Marchand --- lib/librte_net/rte_mpls.h | 2 +- lib/librte_net/rte_net.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_net/rte_mpls.h b/lib/librte_net/rte_mpls.h index 11d26ba..32b6431 100644 --- a/lib/librte_net/rte_mpls.h +++ b/lib/librte_net/rte_mpls.h @@ -21,7 +21,7 @@ extern "C" { /** * MPLS header. */ -struct mpls_hdr { +struct rte_mpls_hdr { uint16_t tag_msb; /**< Label(msb). */ #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN uint8_t tag_lsb:4; /**< Label(lsb). */ diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index dfccbbf..6f45b13 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.c @@ -278,8 +278,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, } else if ((proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLS)) || (proto == rte_cpu_to_be_16(RTE_ETHER_TYPE_MPLSM))) { unsigned int i; - const struct mpls_hdr *mh; - struct mpls_hdr mh_copy; + const struct rte_mpls_hdr *mh; + struct rte_mpls_hdr mh_copy; #define MAX_MPLS_HDR 5 for (i = 0; i < MAX_MPLS_HDR; i++) { From patchwork Wed Oct 23 08:51:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 61712 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7CC4D1BFFE; Wed, 23 Oct 2019 10:52:24 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 5ADDE1BFEE for ; Wed, 23 Oct 2019 10:52:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571820739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g+5B1UYFHIsxGkM8HrmuYQYCm8Azt/MEmJOfDJGBKwI=; b=dgTf0WC6zAZzZePxmu1IEpeJ8SobHBvLP1jcs6bfQRncqy5pomfJ+oAO5KhEXpeq5drcHF 8eseh1TuAVRMLpKMrqCeXTmGqkbRWLbCDbqYDrXbwTXIjMZG9mkGseKmx96qsjr/lDrLQU Q/zakS8Q7WktYs8jplMrJifPi2Jzr2Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-372-G7cMBSzdNXO2Z9yU4-7a-g-1; Wed, 23 Oct 2019 04:52:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C3A9476; Wed, 23 Oct 2019 08:52:14 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-129.brq.redhat.com [10.40.204.129]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8B3519C70; Wed, 23 Oct 2019 08:52:12 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: olivier.matz@6wind.com, ferruh.yigit@intel.com Date: Wed, 23 Oct 2019 10:51:58 +0200 Message-Id: <1571820718-7021-4-git-send-email-david.marchand@redhat.com> In-Reply-To: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> References: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: G7cMBSzdNXO2Z9yU4-7a-g-1 X-Mimecast-Spam-Score: 0 Subject: [dpdk-dev] [PATCH 3/3] net: hide internal CRC defines 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" No need to let those (non RTE_ prefixed) defines public. Hide them where we use them. Signed-off-by: David Marchand --- lib/librte_net/rte_net_crc.c | 6 ++++++ lib/librte_net/rte_net_crc.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/librte_net/rte_net_crc.c b/lib/librte_net/rte_net_crc.c index dca0830..9fd4794 100644 --- a/lib/librte_net/rte_net_crc.c +++ b/lib/librte_net/rte_net_crc.c @@ -22,6 +22,12 @@ #include #endif +/** CRC polynomials */ +#define CRC32_ETH_POLYNOMIAL 0x04c11db7UL +#define CRC16_CCITT_POLYNOMIAL 0x1021U + +#define CRC_LUT_SIZE 256 + /* crc tables */ static uint32_t crc32_eth_lut[CRC_LUT_SIZE]; static uint32_t crc16_ccitt_lut[CRC_LUT_SIZE]; diff --git a/lib/librte_net/rte_net_crc.h b/lib/librte_net/rte_net_crc.h index 8a86f29..16e85ca 100644 --- a/lib/librte_net/rte_net_crc.h +++ b/lib/librte_net/rte_net_crc.h @@ -11,12 +11,6 @@ extern "C" { #endif -/** CRC polynomials */ -#define CRC32_ETH_POLYNOMIAL 0x04c11db7UL -#define CRC16_CCITT_POLYNOMIAL 0x1021U - -#define CRC_LUT_SIZE 256 - /** CRC types */ enum rte_net_crc_type { RTE_NET_CRC16_CCITT = 0,