From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 17 Sep 2018 16:13:15 +0000 (-0400)
Subject: zebra: Cleanup comments to appropriately match style
X-Git-Tag: frr-7.1-dev~342^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=98efddf1d7e0c61d309091397885721f7d57cfaf;p=mirror%2Ffrr.git

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 6c71fddbbf..bf5d834278 100644
--- 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 9e43a5b53c..8e492b8069 100644
--- 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 397bfaec93..ea0bef3718 100644
--- 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))