X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface.h;h=5ca489db32d3d5d87f2beb8db403a30313815709;hb=c87c91d8b0e85997debaf575f2e30cc2702edf25;hp=095fe9617e2d7430bcb2e65776c6890d8d20b5e6;hpb=abce509affe1f25bbb4905670371ad202529d5e0;p=vpp.git

diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index 095fe9617e2..5ca489db32d 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -54,6 +54,7 @@ typedef enum
   VNET_HW_INTERFACE_RX_MODE_POLLING,
   VNET_HW_INTERFACE_RX_MODE_INTERRUPT,
   VNET_HW_INTERFACE_RX_MODE_ADAPTIVE,
+  VNET_HW_INTERFACE_RX_MODE_DEFAULT,
   VNET_HW_INTERFACE_NUM_RX_MODES,
 } vnet_hw_interface_rx_mode;
 
@@ -197,9 +198,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;
@@ -418,13 +416,12 @@ typedef struct vnet_hw_interface_t
    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;
@@ -492,6 +489,7 @@ typedef struct vnet_hw_interface_t
 
   /* vnet_hw_interface_rx_mode by queue */
   u8 *rx_mode_by_queue;
+  vnet_hw_interface_rx_mode default_rx_mode;
 
   /* device input device_and_queue runtime index */
   uword *dq_runtime_index_by_queue;
@@ -507,6 +505,7 @@ typedef enum
 
   /* A sub-interface. */
   VNET_SW_INTERFACE_TYPE_SUB,
+  VNET_SW_INTERFACE_TYPE_P2P,
 } vnet_sw_interface_type_t;
 
 typedef struct
@@ -540,6 +539,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 */
@@ -570,10 +580,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. */
@@ -596,6 +606,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;