diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index ecd9947a58..3022021737 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -1956,9 +1956,8 @@ static void _netlink_nexthop_build_group(struct nlmsghdr *n, size_t req_size,
  *
  * \returns -1 on failure or the number of bytes written to buf.
  */
-ssize_t
-netlink_nexthop_encode(uint16_t cmd, const struct zebra_dplane_ctx *ctx,
-		       void *buf, size_t buflen)
+ssize_t netlink_nexthop_encode(uint16_t cmd, const struct zebra_dplane_ctx *ctx,
+			       void *buf, size_t buflen)
 {
 	struct {
 		struct nlmsghdr n;
@@ -2224,8 +2223,8 @@ enum zebra_dplane_result kernel_route_update(struct zebra_dplane_ctx *ctx)
 	}
 
 	if (!RSYSTEM_ROUTE(dplane_ctx_get_type(ctx))) {
-		netlink_route_multipath(cmd, ctx, nl_pkt, sizeof(nl_pkt),
-					false, false);
+		netlink_route_multipath(cmd, ctx, nl_pkt, sizeof(nl_pkt), false,
+					false);
 		ret = netlink_talk_info(netlink_talk_filter,
 					(struct nlmsghdr *)nl_pkt,
 					dplane_ctx_get_ns(ctx), 0);
diff --git a/zebra/rt_netlink.h b/zebra/rt_netlink.h
index 3048eea75d..c09609f47c 100644
--- a/zebra/rt_netlink.h
+++ b/zebra/rt_netlink.h
@@ -67,8 +67,8 @@ void rt_netlink_init(void);
 extern int netlink_mpls_multipath(int cmd, struct zebra_dplane_ctx *ctx);
 
 extern ssize_t netlink_route_multipath(int cmd, struct zebra_dplane_ctx *ctx,
-				       uint8_t *data, size_t datalen,
-				       bool fpm, bool force_nhg);
+				       uint8_t *data, size_t datalen, bool fpm,
+				       bool force_nhg);
 extern ssize_t netlink_macfdb_update_ctx(struct zebra_dplane_ctx *ctx,
 					 uint8_t *data, size_t datalen);
 
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 4441b0971d..6afd4e6214 100644
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -1658,8 +1658,7 @@ done:
  *
  * Return:	Result status
  */
-int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx,
-			    enum dplane_op_e op,
+int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx, enum dplane_op_e op,
 			    struct nhg_hash_entry *nhe)
 {
 	struct zebra_vrf *zvrf = NULL;
diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h
index 5812954373..9ce542944d 100644
--- a/zebra/zebra_dplane.h
+++ b/zebra/zebra_dplane.h
@@ -500,8 +500,7 @@ int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx, enum dplane_op_e op,
 			  struct route_node *rn, struct route_entry *re);
 
 /* Encode next hop information into data plane context. */
-int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx,
-			    enum dplane_op_e op,
+int dplane_ctx_nexthop_init(struct zebra_dplane_ctx *ctx, enum dplane_op_e op,
 			    struct nhg_hash_entry *nhe);
 
 /* Retrieve the limit on the number of pending, unprocessed updates. */