Merge branch 'master' into docuser

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index a6e0882ff8..9d3133f55b 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -719,8 +719,7 @@ static int zfpm_read_cb(struct thread *thread)
 				sprintf(buffer, "closed socket in read(%d): %s",
 					errno, safe_strerror(errno));
 				zfpm_connection_down(buffer);
-			}
-			else
+			} else
 				zfpm_connection_down("closed socket in read");
 			return 0;
 		}
@@ -757,8 +756,7 @@ static int zfpm_read_cb(struct thread *thread)
 				sprintf(buffer, "failed to read message(%d) %s",
 					errno, safe_strerror(errno));
 				zfpm_connection_down(buffer);
-			}
-			else
+			} else
 				zfpm_connection_down("failed to read message");
 			return 0;
 		}
@@ -1554,9 +1552,8 @@ static int fpm_remote_srv_write(struct vty *vty)
 	in.s_addr = zfpm_g->fpm_server;
 
 	if ((zfpm_g->fpm_server != FPM_DEFAULT_IP
-		&& zfpm_g->fpm_server != INADDR_ANY)
-	    || (zfpm_g->fpm_port != FPM_DEFAULT_PORT
-		&& zfpm_g->fpm_port != 0))
+	     && zfpm_g->fpm_server != INADDR_ANY)
+	    || (zfpm_g->fpm_port != FPM_DEFAULT_PORT && zfpm_g->fpm_port != 0))
 		vty_out(vty, "fpm connection ip %s port %d\n", inet_ntoa(in),
 			zfpm_g->fpm_port);