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 1041FA3295 for ; Wed, 23 Oct 2019 15:40:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 359A01C213; Wed, 23 Oct 2019 15:40:21 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 70B911C1E3 for ; Wed, 23 Oct 2019 15:40:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571838015; 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=AvNHgoFR7RrM3yoiE5csA0oa172XfhmjgufprosRAiY=; b=UfC1t32YIr8GJScXzo/7F9vFO/UIZVx8ovWfz9+4a5j8dPOQovp2jDdRQ0J7sdTtKlwcMh aPV0tZ/2igij6vEEKw+qqS0A4fGWQy9B5Qv2nrqrgHIiuMZjqGazILeZO1QHJwYwHfM1dg 37zmbPNgPDu2Rqdmmy1f/iVi6+5tfJM= 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-310-uAzk3DI6OxKTT7xg3vwJQg-1; Wed, 23 Oct 2019 09:40:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 641AA5ED; Wed, 23 Oct 2019 13:40:11 +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 1E78760F82; Wed, 23 Oct 2019 13:40:09 +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 15:39:59 +0200 Message-Id: <1571838001-591-3-git-send-email-david.marchand@redhat.com> In-Reply-To: <1571838001-591-1-git-send-email-david.marchand@redhat.com> References: <1571820718-7021-1-git-send-email-david.marchand@redhat.com> <1571838001-591-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: uAzk3DI6OxKTT7xg3vwJQg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] [PATCH v2 2/4] net: add missing rte prefix on PPPoE defines X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Those two defines have been missed. Fixes: 35b2d13fd6fd ("net: add rte prefix to ether defines") Cc: stable@dpdk.org Signed-off-by: David Marchand --- Changelog since v1: - added missing update on release notes, --- doc/guides/rel_notes/release_19_11.rst | 2 ++ lib/librte_net/rte_ether.h | 4 ++-- lib/librte_pipeline/rte_table_action.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/= release_19_11.rst index d63413b..e97d2cc 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -164,6 +164,8 @@ API Changes =20 * The network structure ``esp_tail`` has been prefixed by ``rte_``. =20 +* The network definitions of PPPoE ethertypes have been prefixed by ``RTE_= ``. + * ethdev: changed ``rte_eth_dev_infos_get`` return value from ``void`` to ``int`` to provide a way to report various error conditions. =20 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 =09/**< IEEE 802.1AS 1588 Precise Time Protocol. */ diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/r= te_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, =09d->cvlan.vlan_tci =3D rte_htons(VLAN(p->qinq.cvlan.pcp, =09=09p->qinq.cvlan.dei, =09=09p->qinq.cvlan.vid)); -=09d->cvlan.eth_proto =3D rte_htons(ETHER_TYPE_PPPOE_SESSION); +=09d->cvlan.eth_proto =3D rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION); =20 =09/* PPPoE and PPP*/ =09d->pppoe_ppp.ver_type_code =3D rte_htons(0x1100); @@ -747,7 +747,7 @@ encap_pppoe_apply(void *data, =09/* Ethernet */ =09rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr); =09rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr); -=09d->ether.ether_type =3D rte_htons(ETHER_TYPE_PPPOE_SESSION); +=09d->ether.ether_type =3D rte_htons(RTE_ETHER_TYPE_PPPOE_SESSION); =20 =09/* PPPoE and PPP*/ =09d->pppoe_ppp.ver_type_code =3D rte_htons(0x1100); --=20 1.8.3.1