X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_bd.h;h=987569aad9e28b794d3d97f0409136fecbf3d11e;hp=ffc75339e9729e7209cf25213ce5eec0de994fd6;hb=4d5b917;hpb=87dad11c8717735479e57cf6c065c7a7963c3aa3

diff --git a/src/vnet/l2/l2_bd.h b/src/vnet/l2/l2_bd.h
index ffc75339e97..987569aad9e 100644
--- a/src/vnet/l2/l2_bd.h
+++ b/src/vnet/l2/l2_bd.h
@@ -20,6 +20,15 @@
 
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ethernet/mac_address.h>
+
+typedef enum l2_bd_port_type_t_
+{
+  L2_BD_PORT_TYPE_NORMAL = 0,
+  L2_BD_PORT_TYPE_BVI = 1,
+  L2_BD_PORT_TYPE_UU_FWD = 2,
+} l2_bd_port_type_t;
 
 typedef struct
 {
@@ -53,16 +62,23 @@ typedef struct
 
 typedef struct
 {
-  u32 feature_bitmap;
   /*
    * Contains bit enables for flooding, learning, and forwarding.
    * All other feature bits should always be set.
-   *
+   */
+  u32 feature_bitmap;
+  /*
    * identity of the bridge-domain's BVI interface
    * set to ~0 if there is no BVI
    */
   u32 bvi_sw_if_index;
 
+  /*
+   * identity of the bridge-domain's UU flood interface
+   * set to ~0 if there is no such configuration
+   */
+  u32 uu_fwd_sw_if_index;
+
   /* bridge domain id, not to be confused with bd_index */
   u32 bd_id;
 
@@ -128,14 +144,18 @@ bd_add_member (l2_bridge_domain_t * bd_config, l2_flood_member_t * member);
 
 u32 bd_remove_member (l2_bridge_domain_t * bd_config, u32 sw_if_index);
 
-
-#define L2_LEARN   (1<<0)
-#define L2_FWD     (1<<1)
-#define L2_FLOOD   (1<<2)
-#define L2_UU_FLOOD (1<<3)
-#define L2_ARP_TERM (1<<4)
-
-u32 bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable);
+typedef enum bd_flags_t_
+{
+  L2_NONE = 0,
+  L2_LEARN = (1 << 0),
+  L2_FWD = (1 << 1),
+  L2_FLOOD = (1 << 2),
+  L2_UU_FLOOD = (1 << 3),
+  L2_ARP_TERM = (1 << 4),
+} bd_flags_t;
+
+u32 bd_set_flags (vlib_main_t * vm, u32 bd_index, bd_flags_t flags,
+		  u32 enable);
 void bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age);
 int bd_add_del (l2_bridge_domain_add_del_args_t * args);
 
@@ -180,7 +200,9 @@ bd_find_or_add_bd_index (bd_main_t * bdm, u32 bd_id)
 }
 
 u32 bd_add_del_ip_mac (u32 bd_index,
-		       u8 * ip_addr, u8 * mac_addr, u8 is_ip6, u8 is_add);
+		       ip46_type_t type,
+		       const ip46_address_t * ip_addr,
+		       const mac_address_t * mac, u8 is_add);
 
 #endif