diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index 684b4b7cd406..5df9e3f23f43 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -577,7 +577,7 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
 		if (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg)) {
 			if (peer->nexthop.v4.s_addr) {
 				ipv4_to_ipv4_mapped_ipv6(mod_v6nhg,
-						peer->nexthop.v4);
+							 peer->nexthop.v4);
 			}
 		}
 
diff --git a/lib/ipaddr.h b/lib/ipaddr.h
index e26523fdbaf6..5cb9ea562a3d 100644
--- a/lib/ipaddr.h
+++ b/lib/ipaddr.h
@@ -93,12 +93,12 @@ static inline char *ipaddr2str(const struct ipaddr *ip, char *buf, int size)
 	return buf;
 }
 
-#define IS_MAPPED_IPV6(A)					\
-	((A)->s6_addr32[0] == 0x00000000			\
-	? ((A)->s6_addr32[1] == 0x00000000			\
-		? (ntohl((A)->s6_addr32[2]) == 0xFFFF ? 1 : 0)	\
-		: 0)						\
-		: 0)
+#define IS_MAPPED_IPV6(A)                                                      \
+	((A)->s6_addr32[0] == 0x00000000                                       \
+		 ? ((A)->s6_addr32[1] == 0x00000000                            \
+			    ? (ntohl((A)->s6_addr32[2]) == 0xFFFF ? 1 : 0)     \
+			    : 0)                                               \
+		 : 0)
 
 /*
  * Convert IPv4 address to IPv4-mapped IPv6 address which is of the