X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface.h;h=d42f079f5854924b4963a787306c4b7c72cb0e86;hb=3c6a976;hp=d684e356ca41c561eba80effb876e8a383a76985;hpb=4e53a0d0f01c8c81842d1f50fb5cf0d26e0c1713;p=vpp.git

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index d684e356ca4..d42f079f585 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -89,21 +89,6 @@ typedef struct _vnet_interface_function_list_elt
   clib_error_t *(*fp) (struct vnet_main_t * vnm, u32 if_index, u32 flags);
 } _vnet_interface_function_list_elt_t;
 
-#define _VNET_INTERFACE_FUNCTION_DECL(f,tag)                            \
-                                                                        \
-static void __vnet_interface_function_init_##tag##_##f (void)           \
-    __attribute__((__constructor__)) ;                                  \
-                                                                        \
-static void __vnet_interface_function_init_##tag##_##f (void)           \
-{                                                                       \
- vnet_main_t * vnm = vnet_get_main();                                   \
- static _vnet_interface_function_list_elt_t init_function;              \
- init_function.next_interface_function =                                \
-   vnm->tag##_functions[VNET_ITF_FUNC_PRIORITY_LOW];                    \
- vnm->tag##_functions[VNET_ITF_FUNC_PRIORITY_LOW] = &init_function;     \
- init_function.fp = (void *) &f;                                        \
-}
-
 #define _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,tag,p)                    \
                                                                         \
 static void __vnet_interface_function_init_##tag##_##f (void)           \
@@ -118,6 +103,9 @@ static void __vnet_interface_function_init_##tag##_##f (void)           \
  init_function.fp = (void *) &f;                                        \
 }
 
+#define _VNET_INTERFACE_FUNCTION_DECL(f,tag)                            \
+  _VNET_INTERFACE_FUNCTION_DECL_PRIO(f,tag,VNET_ITF_FUNC_PRIORITY_LOW)
+
 #define VNET_HW_INTERFACE_ADD_DEL_FUNCTION(f)			\
   _VNET_INTERFACE_FUNCTION_DECL(f,hw_interface_add_del)
 #define VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION(f)		\
@@ -198,9 +186,6 @@ typedef struct _vnet_device_class
   /* Link-list of all device classes set up by constructors created below */
   struct _vnet_device_class *next_class_registration;
 
-  /* Splice vnet_interface_output_node into TX path */
-  u8 flatten_output_chains;
-
   /* Function to set mac address. */
   vnet_interface_set_mac_address_function_t *mac_addr_change_function;
 } vnet_device_class_t;
@@ -409,23 +394,24 @@ typedef struct vnet_hw_interface_t
 #define VNET_HW_INTERFACE_FLAG_SPEED_100M	(1 << 4)
 #define VNET_HW_INTERFACE_FLAG_SPEED_1G		(1 << 5)
 #define VNET_HW_INTERFACE_FLAG_SPEED_10G	(1 << 6)
-#define VNET_HW_INTERFACE_FLAG_SPEED_40G	(1 << 7)
-#define VNET_HW_INTERFACE_FLAG_SPEED_100G	(1 << 8)
+#define VNET_HW_INTERFACE_FLAG_SPEED_25G	(1 << 7)
+#define VNET_HW_INTERFACE_FLAG_SPEED_40G	(1 << 8)
+#define VNET_HW_INTERFACE_FLAG_SPEED_100G	(1 << 9)
 #define VNET_HW_INTERFACE_FLAG_SPEED_MASK	\
   (VNET_HW_INTERFACE_FLAG_SPEED_10M |		\
    VNET_HW_INTERFACE_FLAG_SPEED_100M |		\
    VNET_HW_INTERFACE_FLAG_SPEED_1G |		\
    VNET_HW_INTERFACE_FLAG_SPEED_10G |		\
+   VNET_HW_INTERFACE_FLAG_SPEED_25G |		\
    VNET_HW_INTERFACE_FLAG_SPEED_40G |		\
    VNET_HW_INTERFACE_FLAG_SPEED_100G)
 
-  /* l2output node flags */
-#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_SHIFT	9
-#define VNET_HW_INTERFACE_FLAG_L2OUTPUT_MAPPED	(1 << 9)
-
   /* rx mode flags */
 #define VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE (1 << 10)
 
+  /* tx checksum offload */
+#define VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD (1 << 11)
+
   /* Hardware address as vector.  Zero (e.g. zero-length vector) if no
      address for this class (e.g. PPP). */
   u8 *hw_address;
@@ -448,6 +434,10 @@ typedef struct vnet_hw_interface_t
   /* Software index for this hardware interface. */
   u32 sw_if_index;
 
+  /* Next index in interface-output node for this interface
+     used by node function vnet_per_buffer_interface_output() */
+  u32 output_node_next_index;
+
   /* Maximum transmit rate for this interface in bits/sec. */
   f64 max_rate_bits_per_sec;
 
@@ -509,6 +499,7 @@ typedef enum
 
   /* A sub-interface. */
   VNET_SW_INTERFACE_TYPE_SUB,
+  VNET_SW_INTERFACE_TYPE_P2P,
 } vnet_sw_interface_type_t;
 
 typedef struct
@@ -542,6 +533,17 @@ typedef struct
   } eth;
 } vnet_sub_interface_t;
 
+typedef struct
+{
+  /*
+   * Subinterface ID. A number 0-N to uniquely identify
+   * this subinterface under the main interface
+   */
+  u32 id;
+  u32 pool_index;
+  u8 client_mac[6];
+} vnet_p2p_sub_interface_t;
+
 typedef enum
 {
   /* Always flood */
@@ -572,10 +574,10 @@ typedef struct
 
 #define VNET_SW_INTERFACE_FLAG_BOND_SLAVE (1 << 4)
 
-/* Interface does not appear in CLI/API */
+  /* Interface does not appear in CLI/API */
 #define VNET_SW_INTERFACE_FLAG_HIDDEN (1 << 5)
 
-/* Interface in ERROR state */
+  /* Interface in ERROR state */
 #define VNET_SW_INTERFACE_FLAG_ERROR (1 << 6)
 
   /* Index for this interface. */
@@ -598,6 +600,9 @@ typedef struct
 
     /* VNET_SW_INTERFACE_TYPE_SUB. */
     vnet_sub_interface_t sub;
+
+    /* VNET_SW_INTERFACE_TYPE_P2P. */
+    vnet_p2p_sub_interface_t p2p;
   };
 
   vnet_flood_class_t flood_class;