proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 06:53:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Convert to enum zebra_slave_iftype as per our internal standard

Browse Source 
We do not use typedef's to talk about structures as per our standard.
Fixing.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-08-30 13:27:02 -04:00
parent e6f2bec087
commit a81982fa56
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/if_netlink.c
View File

@ -251,7 +251,7 @@ static enum zebra_link_type netlink_to_zebra_link_type(unsigned int hwt)
static inline void zebra_if_set_ziftype(struct interface *ifp, static inline void zebra_if_set_ziftype(struct interface *ifp,
enum zebra_iftype zif_type, enum zebra_iftype zif_type,
zebra_slave_iftype_t zif_slave_type) enum zebra_slave_iftype zif_slave_type)
{ {
struct zebra_if *zif; struct zebra_if *zif;
@ -876,7 +876,7 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
struct zebra_ns *zns = NULL; struct zebra_ns *zns = NULL;
vrf_id_t vrf_id = VRF_DEFAULT; vrf_id_t vrf_id = VRF_DEFAULT;
enum zebra_iftype zif_type = ZEBRA_IF_OTHER; enum zebra_iftype zif_type = ZEBRA_IF_OTHER;
zebra_slave_iftype_t zif_slave_type = ZEBRA_IF_SLAVE_NONE; enum zebra_slave_iftype zif_slave_type = ZEBRA_IF_SLAVE_NONE;
ifindex_t bridge_ifindex = IFINDEX_INTERNAL; ifindex_t bridge_ifindex = IFINDEX_INTERNAL;
ifindex_t link_ifindex = IFINDEX_INTERNAL; ifindex_t link_ifindex = IFINDEX_INTERNAL;
ifindex_t bond_ifindex = IFINDEX_INTERNAL; ifindex_t bond_ifindex = IFINDEX_INTERNAL;
@ -1468,7 +1468,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
struct zebra_ns *zns; struct zebra_ns *zns;
vrf_id_t vrf_id = VRF_DEFAULT; vrf_id_t vrf_id = VRF_DEFAULT;
enum zebra_iftype zif_type = ZEBRA_IF_OTHER; enum zebra_iftype zif_type = ZEBRA_IF_OTHER;
zebra_slave_iftype_t zif_slave_type = ZEBRA_IF_SLAVE_NONE; enum zebra_slave_iftype zif_slave_type = ZEBRA_IF_SLAVE_NONE;
ifindex_t bridge_ifindex = IFINDEX_INTERNAL; ifindex_t bridge_ifindex = IFINDEX_INTERNAL;
ifindex_t bond_ifindex = IFINDEX_INTERNAL; ifindex_t bond_ifindex = IFINDEX_INTERNAL;
ifindex_t link_ifindex = IFINDEX_INTERNAL; ifindex_t link_ifindex = IFINDEX_INTERNAL;

3
zebra/interface.c
View File

@ -1278,7 +1278,8 @@ static void nbr_connected_dump_vty(struct vty *vty, json_object *json,
vty_out(vty, " %s %pFX\n", prefix_family_str(p), p); vty_out(vty, " %s %pFX\n", prefix_family_str(p), p);
} }
static const char *zebra_zifslavetype_2str(zebra_slave_iftype_t zif_slave_type) static const char *
zebra_zifslavetype_2str(enum zebra_slave_iftype zif_slave_type)
{ {
switch (zif_slave_type) { switch (zif_slave_type) {
case ZEBRA_IF_SLAVE_BRIDGE: case ZEBRA_IF_SLAVE_BRIDGE:

6
zebra/interface.h
View File

@ -267,13 +267,13 @@ enum zebra_iftype {
}; };
/* Zebra "slave" interface type */ /* Zebra "slave" interface type */
typedef enum { enum zebra_slave_iftype {
ZEBRA_IF_SLAVE_NONE, /* Not a slave */ ZEBRA_IF_SLAVE_NONE, /* Not a slave */
ZEBRA_IF_SLAVE_VRF, /* Member of a VRF */ ZEBRA_IF_SLAVE_VRF, /* Member of a VRF */
ZEBRA_IF_SLAVE_BRIDGE, /* Member of a bridge */ ZEBRA_IF_SLAVE_BRIDGE, /* Member of a bridge */
ZEBRA_IF_SLAVE_BOND, /* Bond member */ ZEBRA_IF_SLAVE_BOND, /* Bond member */
ZEBRA_IF_SLAVE_OTHER, /* Something else - e.g., bond slave */ ZEBRA_IF_SLAVE_OTHER, /* Something else - e.g., bond slave */
} zebra_slave_iftype_t; };
struct irdp_interface; struct irdp_interface;
@ -368,7 +368,7 @@ struct zebra_if {
/* Zebra interface and "slave" interface type */ /* Zebra interface and "slave" interface type */
enum zebra_iftype zif_type; enum zebra_iftype zif_type;
zebra_slave_iftype_t zif_slave_type; enum zebra_slave_iftype zif_slave_type;
/* Additional L2 info, depends on zif_type */ /* Additional L2 info, depends on zif_type */
union zebra_l2if_info l2info; union zebra_l2if_info l2info;