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

Message ID 20190118091222.70534-4-nemanja.marjanovic@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Cristian Dumitrescu
Headers
Series [v4,1/4] pipeline: support QinQ PPPoE encap |

Checks

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

Commit Message

Nemanja Marjanovic Jan. 18, 2019, 9:12 a.m. UTC
  From: "Nemanja Marjanovic" <nemanja.marjanovic@intel.com>

Add PPPoE ethertypes in to rte_ether.h.

Signed-off-by: Nemanja Marjanovic <nemanja.marjanovic@intel.com>
---
v4:Added PPPoE ethertypes in to rte_ether.h.
---
 lib/librte_net/rte_ether.h             | 2 ++
 lib/librte_pipeline/rte_table_action.c | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Thomas Monjalon Jan. 18, 2019, 11:01 a.m. UTC | #1
+Cc Olivier, maintainer

18/01/2019 10:12, Nemanja Marjanovic:
> From: "Nemanja Marjanovic" <nemanja.marjanovic@intel.com>
> 
> Add PPPoE ethertypes in to rte_ether.h.
> 
> Signed-off-by: Nemanja Marjanovic <nemanja.marjanovic@intel.com>
> ---
> v4:Added PPPoE ethertypes in to rte_ether.h.
> ---
>  lib/librte_net/rte_ether.h             | 2 ++
>  lib/librte_pipeline/rte_table_action.c | 2 --
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> 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 {
>
  

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 {