zebra: Cleanup comments to appropriately match style

The block comments from a couple commits were not following
proper style.  Fix.

Fix SA warning that had snuck in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 6c71fddbbf9af0fae0f80ca99e68c034af772b69..bf5d834278220171f9e60c1a6c9f681219a09157 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -680,10 +680,12 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        if (IS_ZEBRA_IF_VRF(ifp))
                SET_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK);
 
-       /* Just set the @link/lower-device ifindex. During nldump interfaces are
+       /*
+        * Just set the @link/lower-device ifindex. During nldump interfaces are
         * not ordered in any fashion so we may end up getting upper devices
         * before lower devices. We will setup the real linkage once the dump
-        * is complete. */
+        * is complete.
+        */
        zif = (struct zebra_if *)ifp->info;
        zif->link_ifindex = link_ifindex;
 

diff --git a/zebra/interface.c b/zebra/interface.c
index 9e43a5b53c4ceec55b1842c990476aa0ccfb6f7a..8e492b8069153fe553a3c5e9db66b90f08d3ed4e 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -999,8 +999,10 @@ void zebra_if_update_link(struct interface *ifp, ifindex_t link_ifindex,
                                              link_ifindex);
 }
 
-/* during initial link dump kernel does not order lower devices before
- * upper devices so we need to fixup link dependencies at the end of dump */
+/*
+ * during initial link dump kernel does not order lower devices before
+ * upper devices so we need to fixup link dependencies at the end of dump
+ */
 void zebra_if_update_all_links(void)
 {
        struct route_node *rn;

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 397bfaec93a4aa36347b20ff75dc3044a9926138..ea0bef37183b841569bd7588714cf9a566678be8 100644 (file)
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -2626,7 +2626,7 @@ static int zvni_mac_uninstall(zebra_vni_t *zvni, zebra_mac_t *mac)
 {
        struct zebra_if *zif;
        struct zebra_l2info_vxlan *vxl;
-       struct in_addr vtep_ip = {.s_addr = 0};
+       struct in_addr vtep_ip;
        struct interface *ifp;
 
        if (!(mac->flags & ZEBRA_MAC_REMOTE))