DPDK patches and discussions
 help / color / mirror / Atom feed
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: olivier.matz@6wind.com, ferruh.yigit@intel.com, stable@dpdk.org
Subject: [dpdk-dev] [PATCH 1/3] net: add missing rte prefix on PPPoE defines
Date: Wed, 23 Oct 2019 10:51:56 +0200	[thread overview]
Message-ID: <1571820718-7021-2-git-send-email-david.marchand@redhat.com> (raw)
In-Reply-To: <1571820718-7021-1-git-send-email-david.marchand@redhat.com>

Those two defines have been missed.

Fixes: 35b2d13fd6fd ("net: add rte prefix to ether defines")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 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);
-- 
1.8.3.1


  reply	other threads:[~2019-10-23  8:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-23  8:51 [dpdk-dev] [PATCH 0/3] net definitions fixes David Marchand
2019-10-23  8:51 ` David Marchand [this message]
2019-10-23  8:51 ` [dpdk-dev] [PATCH 2/3] net: add rte prefix to MPLS structure David Marchand
2019-10-23  8:51 ` [dpdk-dev] [PATCH 3/3] net: hide internal CRC defines David Marchand
2019-10-23 12:12 ` [dpdk-dev] [PATCH 0/3] net definitions fixes Ferruh Yigit
2019-10-23 12:57   ` David Marchand
2019-10-23 13:00     ` David Marchand
2019-10-23 13:19       ` Ferruh Yigit
2019-10-23 13:39 ` [dpdk-dev] [PATCH v2 0/4] " David Marchand
2019-10-23 13:39   ` [dpdk-dev] [PATCH v2 1/4] doc: add note on prefixing ESP tail structure David Marchand
2019-10-23 13:39   ` [dpdk-dev] [PATCH v2 2/4] net: add missing rte prefix on PPPoE defines David Marchand
2019-10-23 13:40   ` [dpdk-dev] [PATCH v2 3/4] net: add rte prefix to MPLS structure David Marchand
2019-10-23 13:40   ` [dpdk-dev] [PATCH v2 4/4] net: hide internal CRC defines David Marchand
2019-10-23 20:03   ` [dpdk-dev] [PATCH v2 0/4] net definitions fixes Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1571820718-7021-2-git-send-email-david.marchand@redhat.com \
    --to=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=olivier.matz@6wind.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).