[v6,4/4] net: add PPPoE ethertypes

Message ID 20190121111124.16362-4-nemanja.marjanovic@intel.com
State Accepted
Delegated to: Cristian Dumitrescu
Headers show
Series
  • [v6,1/4] pipeline: support QinQ PPPoE encap
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Nemanja Marjanovic Jan. 21, 2019, 11:11 a.m.
From: "Nemanja Marjanovic" <nemanja.marjanovic@intel.com>

Add PPPoE ethertypes in to rte_ether.h.

Signed-off-by: Nemanja Marjanovic <nemanja.marjanovic@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
v5:Removing footer from patch.
v6:Added missing acks.
---
 lib/librte_net/rte_ether.h             | 2 ++
 lib/librte_pipeline/rte_table_action.c | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
index c2c5e249f..54822df75 100644
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -301,6 +301,8 @@  struct vxlan_hdr {
 #define ETHER_TYPE_RARP 0x8035 /**< Reverse Arp Protocol. */
 #define ETHER_TYPE_VLAN 0x8100 /**< IEEE 802.1Q VLAN tagging. */
 #define 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 ETHER_TYPE_ETAG 0x893F /**< IEEE 802.1BR E-Tag. */
 #define ETHER_TYPE_1588 0x88F7 /**< IEEE 802.1AS 1588 Precise Time Protocol. */
 #define ETHER_TYPE_SLOW 0x8809 /**< Slow protocols (LACP and Marker). */
diff --git a/lib/librte_pipeline/rte_table_action.c b/lib/librte_pipeline/rte_table_action.c
index 466019934..ac8109f00 100644
--- a/lib/librte_pipeline/rte_table_action.c
+++ b/lib/librte_pipeline/rte_table_action.c
@@ -485,8 +485,6 @@  struct encap_mpls_data {
 	uint32_t mpls_count;
 } __attribute__((__packed__));
 
-#define ETHER_TYPE_PPPOE_SESSION                           0x8864
-
 #define PPP_PROTOCOL_IP                                    0x0021
 
 struct pppoe_ppp_hdr {