zebra: Convert to `enum zebra_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>

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 2a9fff26661c80f79bd34ec6c05717506a60ef62..cadbace7a9060b8e7955b4f3bc6bd9e98bb89fba 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -250,7 +250,7 @@ static enum zebra_link_type netlink_to_zebra_link_type(unsigned int hwt)
 }
 
 static inline void zebra_if_set_ziftype(struct interface *ifp,
-                                       zebra_iftype_t zif_type,
+                                       enum zebra_iftype zif_type,
                                        zebra_slave_iftype_t zif_slave_type)
 {
        struct zebra_if *zif;
@@ -270,7 +270,7 @@ static inline void zebra_if_set_ziftype(struct interface *ifp,
 }
 
 static void netlink_determine_zebra_iftype(const char *kind,
-                                          zebra_iftype_t *zif_type)
+                                          enum zebra_iftype *zif_type)
 {
        *zif_type = ZEBRA_IF_OTHER;
 
@@ -875,7 +875,7 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        char *slave_kind = NULL;
        struct zebra_ns *zns = NULL;
        vrf_id_t vrf_id = VRF_DEFAULT;
-       zebra_iftype_t zif_type = ZEBRA_IF_OTHER;
+       enum zebra_iftype zif_type = ZEBRA_IF_OTHER;
        zebra_slave_iftype_t zif_slave_type = ZEBRA_IF_SLAVE_NONE;
        ifindex_t bridge_ifindex = IFINDEX_INTERNAL;
        ifindex_t link_ifindex = IFINDEX_INTERNAL;
@@ -1467,7 +1467,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        char *slave_kind = NULL;
        struct zebra_ns *zns;
        vrf_id_t vrf_id = VRF_DEFAULT;
-       zebra_iftype_t zif_type = ZEBRA_IF_OTHER;
+       enum zebra_iftype zif_type = ZEBRA_IF_OTHER;
        zebra_slave_iftype_t zif_slave_type = ZEBRA_IF_SLAVE_NONE;
        ifindex_t bridge_ifindex = IFINDEX_INTERNAL;
        ifindex_t bond_ifindex = IFINDEX_INTERNAL;

diff --git a/zebra/interface.c b/zebra/interface.c
index 18f7503f82fa26d266f209f285cf3a244c8cae78..e0a549ee29916dc55748cfcb094c1b3237357847 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1295,7 +1295,7 @@ static const char *zebra_zifslavetype_2str(zebra_slave_iftype_t zif_slave_type)
        return "None";
 }
 
-static const char *zebra_ziftype_2str(zebra_iftype_t zif_type)
+static const char *zebra_ziftype_2str(enum zebra_iftype zif_type)
 {
        switch (zif_type) {
        case ZEBRA_IF_OTHER:

diff --git a/zebra/interface.h b/zebra/interface.h
index df4872d48e4fe70df48173b6050bab5665df8ef7..3da25a3b042d21ccbfaa3a66e959178033df9139 100644 (file)
--- a/zebra/interface.h
+++ b/zebra/interface.h
@@ -253,7 +253,7 @@ struct rtadv_dnssl {
 #endif /* HAVE_RTADV */
 
 /* Zebra interface type - ones of interest. */
-typedef enum {
+enum zebra_iftype {
        ZEBRA_IF_OTHER = 0, /* Anything else */
        ZEBRA_IF_VXLAN,     /* VxLAN interface */
        ZEBRA_IF_VRF,       /* VRF device */
@@ -264,7 +264,7 @@ typedef enum {
        ZEBRA_IF_BOND,      /* Bond */
        ZEBRA_IF_BOND_SLAVE,        /* Bond */
        ZEBRA_IF_GRE,      /* GRE interface */
-} zebra_iftype_t;
+};
 
 /* Zebra "slave" interface type */
 typedef enum {
@@ -367,7 +367,7 @@ struct zebra_if {
        uint8_t ptm_enable;
 
        /* Zebra interface and "slave" interface type */
-       zebra_iftype_t zif_type;
+       enum zebra_iftype zif_type;
        zebra_slave_iftype_t zif_slave_type;
 
        /* Additional L2 info, depends on zif_type */