diff options
| author | whitespace / reindent <invalid@invalid.invalid> | 2017-07-17 14:03:14 +0200 |
|---|---|---|
| committer | whitespace / reindent <invalid@invalid.invalid> | 2017-07-17 14:04:07 +0200 |
| commit | d62a17aedeb0eebdba98238874bb13d62c48dbf9 (patch) | |
| tree | 3b319b1d61c8b85b4d1f06adf8b844bb8a9b5107 /zebra/zebra_l2.h | |
| parent | 888ac268a0077fc9ebd1218cec6ae472af0bfc40 (diff) | |
*: reindentreindent-master-after
indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra/zebra_l2.h')
| -rw-r--r-- | zebra/zebra_l2.h | 71 |
1 files changed, 33 insertions, 38 deletions
diff --git a/zebra/zebra_l2.h b/zebra/zebra_l2.h index 5cfc6dee44..d9bbcfed6f 100644 --- a/zebra/zebra_l2.h +++ b/zebra/zebra_l2.h @@ -30,37 +30,32 @@ #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 { + u_char 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; +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 +65,25 @@ 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_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); #endif /* _ZEBRA_L2_H */ |