diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2021-08-30 19:27:02 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2021-09-02 16:33:23 +0200 |
| commit | a81982fa567086b280f2bf636876ada5d4f4f718 (patch) | |
| tree | 854d637fb4369230943434777690428d5c15ae15 /zebra | |
| parent | zebra: Convert to `enum zebra_iftype` as per our internal standard (diff) | |
| download | frr-a81982fa567086b280f2bf636876ada5d4f4f718.tar.xz frr-a81982fa567086b280f2bf636876ada5d4f4f718.zip | |
zebra: Convert to `enum zebra_slave_iftype` as per our internal standard
We do not use typedef's to talk about structures as per our standard.
Fixing.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/if_netlink.c | 6 | ||||
| -rw-r--r-- | zebra/interface.c | 3 | ||||
| -rw-r--r-- | zebra/interface.h | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index cadbace7a..8b3b788b7 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -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, enum zebra_iftype zif_type, - zebra_slave_iftype_t zif_slave_type) + enum zebra_slave_iftype zif_slave_type) { 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; vrf_id_t vrf_id = VRF_DEFAULT; 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 link_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; vrf_id_t vrf_id = VRF_DEFAULT; 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 bond_ifindex = IFINDEX_INTERNAL; ifindex_t link_ifindex = IFINDEX_INTERNAL; diff --git a/zebra/interface.c b/zebra/interface.c index e0a549ee2..328ef3fa4 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -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); } -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) { case ZEBRA_IF_SLAVE_BRIDGE: diff --git a/zebra/interface.h b/zebra/interface.h index 3da25a3b0..d86bc68ef 100644 --- a/zebra/interface.h +++ b/zebra/interface.h @@ -267,13 +267,13 @@ enum zebra_iftype { }; /* Zebra "slave" interface type */ -typedef enum { +enum zebra_slave_iftype { ZEBRA_IF_SLAVE_NONE, /* Not a slave */ ZEBRA_IF_SLAVE_VRF, /* Member of a VRF */ ZEBRA_IF_SLAVE_BRIDGE, /* Member of a bridge */ ZEBRA_IF_SLAVE_BOND, /* Bond member */ ZEBRA_IF_SLAVE_OTHER, /* Something else - e.g., bond slave */ -} zebra_slave_iftype_t; +}; struct irdp_interface; @@ -368,7 +368,7 @@ struct zebra_if { /* Zebra interface and "slave" interface 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 */ union zebra_l2if_info l2info; |