X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Ftap.h;h=2efaa511a4928615bbe109480f6dd8cc03b7298b;hb=a6c34a19d;hp=7d07ffb4e82ab738c567f1c4dc6abb8993021ff9;hpb=2df39094d20ae60d2e04316f4ec058f81778cf64;p=vpp.git

diff --git a/src/vnet/devices/tap/tap.h b/src/vnet/devices/tap/tap.h
index 7d07ffb4e82..2efaa511a49 100644
--- a/src/vnet/devices/tap/tap.h
+++ b/src/vnet/devices/tap/tap.h
@@ -22,21 +22,46 @@
 #define MIN(x,y) (((x)<(y))?(x):(y))
 #endif
 
+#define foreach_tapv2_flags  \
+  _ (GSO, 0)                 \
+  _ (CSUM_OFFLOAD, 1)        \
+  _ (PERSIST, 2)             \
+  _ (ATTACH, 3)              \
+  _ (TUN, 4)                 \
+  _ (GRO_COALESCE, 5)        \
+  _ (PACKED, 6)              \
+  _ (IN_ORDER, 7)
+
+typedef enum
+{
+#define _(a, b) TAP_FLAG_##a = (1 << b),
+  foreach_tapv2_flags
+#undef _
+} tap_flag_t;
+
 typedef struct
 {
   u32 id;
   u8 mac_addr_set;
-  u8 mac_addr[6];
+  mac_address_t mac_addr;
+  u8 num_rx_queues;
   u16 rx_ring_sz;
   u16 tx_ring_sz;
+  u32 tap_flags;
   u8 *host_namespace;
   u8 *host_if_name;
-  u8 host_mac_addr[6];
+  mac_address_t host_mac_addr;
   u8 *host_bridge;
   ip4_address_t host_ip4_addr;
-  u32 host_ip4_prefix_len;
+  u8 host_ip4_prefix_len;
+  ip4_address_t host_ip4_gw;
+  u8 host_ip4_gw_set;
   ip6_address_t host_ip6_addr;
-  u32 host_ip6_prefix_len;
+  u8 host_ip6_prefix_len;
+  ip6_address_t host_ip6_gw;
+  u8 host_ip6_gw_set;
+  u8 host_mtu_set;
+  u32 host_mtu_size;
   /* return */
   u32 sw_if_index;
   int rv;
@@ -46,19 +71,45 @@ typedef struct
 /** TAP interface details struct */
 typedef struct
 {
+  u32 id;
   u32 sw_if_index;
+  u32 tap_flags;
   u8 dev_name[64];
+  u16 tx_ring_sz;
+  u16 rx_ring_sz;
+  mac_address_t host_mac_addr;
+  u8 host_if_name[64];
+  u8 host_namespace[64];
+  u8 host_bridge[64];
+  ip4_address_t host_ip4_addr;
+  u8 host_ip4_prefix_len;
+  ip6_address_t host_ip6_addr;
+  u8 host_ip6_prefix_len;
+  u32 host_mtu_size;
 } tap_interface_details_t;
 
 typedef struct
 {
-  u32 last_used_interface_id;
-  uword *dev_instance_by_interface_id;
+  /* logging */
+  vlib_log_class_t log_default;
+
+  /* bit-map of in-use IDs */
+  uword *tap_ids;
+
+  /* host mtu size, configurable through startup.conf */
+  int host_mtu_size;
 } tap_main_t;
 
 void tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args);
 int tap_delete_if (vlib_main_t * vm, u32 sw_if_index);
+int tap_gso_enable_disable (vlib_main_t * vm, u32 sw_if_index,
+			    int enable_disable, int packet_coalesce);
+int
+tap_csum_offload_enable_disable (vlib_main_t * vm, u32 sw_if_index,
+				 int enable_disable);
 int tap_dump_ifs (tap_interface_details_t ** out_tapids);
+int tap_set_carrier (u32 hw_if_index, u32 carrier_up);
+int tap_set_speed (u32 hw_if_index, u32 speed);
 
 #endif /* _VNET_DEVICES_VIRTIO_TAP_H_ */