lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / zebra / zebra_l2.h

diff --git a/zebra/zebra_l2.h b/zebra/zebra_l2.h
index 5cfc6dee447770167df25bbd776f4985bb992686..68c9d4a7a1a72bbf072da5a105aabd4a04eb2179 100644 (file)
--- a/zebra/zebra_l2.h
+++ b/zebra/zebra_l2.h
@@ -30,37 +30,37 @@
 #include "vxlan.h"
 
 /* zebra L2 interface information - bridge slave (linkage to bridge) */
-struct zebra_l2info_brslave
-{
-  ifindex_t bridge_ifindex;   /* Bridge Master */
-  struct interface *br_if;    /* Pointer to master */
+struct zebra_l2info_brslave {
+       ifindex_t bridge_ifindex; /* Bridge Master */
+       struct interface *br_if;  /* Pointer to master */
 };
 
 /* zebra L2 interface information - bridge interface */
-struct zebra_l2info_bridge
-{
-  u_char vlan_aware;          /* VLAN-aware bridge? */
+struct zebra_l2info_bridge {
+       uint8_t vlan_aware; /* VLAN-aware bridge? */
 };
 
 /* zebra L2 interface information - VLAN interface */
-struct zebra_l2info_vlan
-{
-  vlanid_t vid;                  /* VLAN id */
+struct zebra_l2info_vlan {
+       vlanid_t vid; /* VLAN id */
 };
 
 /* zebra L2 interface information - VXLAN interface */
-struct zebra_l2info_vxlan
-{
-  vni_t vni;                     /* VNI */
-  struct in_addr vtep_ip;        /* Local tunnel IP */
-  vlanid_t access_vlan;          /* Access VLAN - for VLAN-aware bridge. */
+struct zebra_l2info_vxlan {
+       vni_t vni;              /* VNI */
+       struct in_addr vtep_ip; /* Local tunnel IP */
+       vlanid_t access_vlan;   /* Access VLAN - for VLAN-aware bridge. */
 };
 
-union zebra_l2if_info
-{
-  struct zebra_l2info_bridge  br;
-  struct zebra_l2info_vlan    vl;
-  struct zebra_l2info_vxlan   vxl;
+struct zebra_l2info_bondslave {
+       ifindex_t bond_ifindex;    /* Bridge Master */
+       struct interface *bond_if; /* Pointer to master */
+};
+
+union zebra_l2if_info {
+       struct zebra_l2info_bridge br;
+       struct zebra_l2info_vlan vl;
+       struct zebra_l2info_vxlan vxl;
 };
 
 /* NOTE: These macros are to be invoked only in the "correct" context.
@@ -70,25 +70,30 @@ union zebra_l2if_info
 #define VNI_FROM_ZEBRA_IF(zif) (zif)->l2info.vxl.vni
 #define VLAN_ID_FROM_ZEBRA_IF(zif) (zif)->l2info.vl.vid
 
-#define IS_ZEBRA_IF_BRIDGE_VLAN_AWARE(zif) \
-        ((zif)->l2info.br.vlan_aware == 1)
-
+#define IS_ZEBRA_IF_BRIDGE_VLAN_AWARE(zif) ((zif)->l2info.br.vlan_aware == 1)
 
-extern void zebra_l2_map_slave_to_bridge (struct zebra_l2info_brslave *br_slave);
-extern void zebra_l2_unmap_slave_from_bridge (struct zebra_l2info_brslave *br_slave);
-extern void zebra_l2_bridge_add_update (struct interface *ifp,
-                                        struct zebra_l2info_bridge *bridge_info,
-                                        int add);
-extern void zebra_l2_bridge_del (struct interface *ifp);
-extern void zebra_l2_vlanif_update (struct interface *ifp,
-                                    struct zebra_l2info_vlan *vlan_info);
-extern void zebra_l2_vxlanif_add_update (struct interface *ifp,
-                                         struct zebra_l2info_vxlan *vxlan_info,
-                                         int add);
-extern void zebra_l2_vxlanif_update_access_vlan (struct interface *ifp,
-                                                 vlanid_t access_vlan);
-extern void zebra_l2_vxlanif_del (struct interface *ifp);
-extern void zebra_l2if_update_bridge_slave (struct interface *ifp,
-                                            ifindex_t bridge_ifindex);
+extern void zebra_l2_map_slave_to_bridge(struct zebra_l2info_brslave *br_slave);
+extern void
+zebra_l2_unmap_slave_from_bridge(struct zebra_l2info_brslave *br_slave);
+extern void
+zebra_l2_map_slave_to_bond(struct zebra_l2info_bondslave *bond_slave);
+extern void
+zebra_l2_unmap_slave_from_bond(struct zebra_l2info_bondslave *bond_slave);
+extern void zebra_l2_bridge_add_update(struct interface *ifp,
+                                      struct zebra_l2info_bridge *bridge_info,
+                                      int add);
+extern void zebra_l2_bridge_del(struct interface *ifp);
+extern void zebra_l2_vlanif_update(struct interface *ifp,
+                                  struct zebra_l2info_vlan *vlan_info);
+extern void zebra_l2_vxlanif_add_update(struct interface *ifp,
+                                       struct zebra_l2info_vxlan *vxlan_info,
+                                       int add);
+extern void zebra_l2_vxlanif_update_access_vlan(struct interface *ifp,
+                                               vlanid_t access_vlan);
+extern void zebra_l2_vxlanif_del(struct interface *ifp);
+extern void zebra_l2if_update_bridge_slave(struct interface *ifp,
+                                          ifindex_t bridge_ifindex);
 
+extern void zebra_l2if_update_bond_slave(struct interface *ifp,
+                                        ifindex_t bond_ifindex);
 #endif /* _ZEBRA_L2_H */