VPP-355: add PBB (802.1ah) tag rewrite

[vpp.git] / vnet / vnet / ethernet / packet.h

diff --git a/vnet/vnet/ethernet/packet.h b/vnet/vnet/ethernet/packet.h
index b5d1dcb..964cf63 100644 (file)
--- a/vnet/vnet/ethernet/packet.h
+++ b/vnet/vnet/ethernet/packet.h
@@ -40,13 +40,15 @@
 #ifndef included_ethernet_packet_h
 #define included_ethernet_packet_h
 
-typedef enum {
+typedef enum
+{
 #define ethernet_type(n,s) ETHERNET_TYPE_##s = n,
 #include <vnet/ethernet/types.def>
 #undef ethernet_type
 } ethernet_type_t;
 
-typedef struct {
+typedef struct
+{
   /* Source/destination address. */
   u8 dst_address[6];
   u8 src_address[6];
@@ -61,18 +63,25 @@ typedef struct {
 /* I/G bit: individual (unicast)/group (broadcast/multicast). */
 always_inline uword
 ethernet_address_cast (u8 * a)
-{ return (a[0] >> 0) & 1; }
+{
+  return (a[0] >> 0) & 1;
+}
 
 always_inline uword
 ethernet_address_is_locally_administered (u8 * a)
-{ return (a[0] >> 1) & 1; }
+{
+  return (a[0] >> 1) & 1;
+}
 
 always_inline void
 ethernet_address_set_locally_administered (u8 * a)
-{ a[0] |= 1 << 1; }
+{
+  a[0] |= 1 << 1;
+}
 
 /* For VLAN ethernet type. */
-typedef struct {
+typedef struct
+{
   /* 3 bit priority, 1 bit CFI and 12 bit vlan id. */
   u16 priority_cfi_and_id;
 
@@ -84,7 +93,8 @@ typedef struct {
 
 
 /* VLAN with ethertype first and vlan id second */
-typedef struct {
+typedef struct
+{
   /* vlan type */
   u16 type;
 
@@ -92,4 +102,51 @@ typedef struct {
   u16 priority_cfi_and_id;
 } ethernet_vlan_header_tv_t;
 
+/* PBB header with B-TAG - backbone VLAN indicator and I-TAG - service encapsulation */
+typedef struct
+{
+  /* Backbone source/destination address. */
+  u8 b_dst_address[6];
+  u8 b_src_address[6];
+
+  /* B-tag */
+  u16 b_type;
+  /* 3 bit priority, 1 bit DEI and 12 bit vlan id */
+  u16 priority_dei_id;
+
+  /* I-tag */
+  u16 i_type;
+  /* 3 bit priority, 1 bit DEI, 1 bit UCA, 3 bit RES and 24 bit I_SID (service identifier) */
+  u32 priority_dei_uca_res_sid;
+
+#define ETHERNET_N_PBB (1 << 24)
+} ethernet_pbb_header_t;
+
+/* *INDENT-OFF* */
+typedef CLIB_PACKED (struct
+{
+  /* Backbone source/destination address. */
+  u8 b_dst_address[6];
+  u8 b_src_address[6];
+
+  /* B-tag */
+  u16 b_type;
+  /* 3 bit priority, 1 bit DEI and 12 bit vlan id */
+  u16 priority_dei_id;
+
+  /* I-tag */
+  u16 i_type;
+  /* 3 bit priority, 1 bit DEI, 1 bit UCA, 3 bit RES and 24 bit I_SID (service identifier) */
+  u32 priority_dei_uca_res_sid;
+}) ethernet_pbb_header_packed_t;
+/* *INDENT-ON* */
+
 #endif /* included_ethernet_packet_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */