Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing

Conflicts:
	bgpd/bgp_evpn.c

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/hook.c b/lib/hook.c
index 1468c4d329..935064f4d2 100644
--- a/lib/hook.c
+++ b/lib/hook.c
@@ -38,9 +38,8 @@ void _hook_register(struct hook *hook, void *funcptr, void *arg, bool has_arg,
 	he->priority = priority;
 
 	for (pos = &hook->entries; *pos; pos = &(*pos)->next)
-		if (hook->reverse
-		    ? (*pos)->priority < priority
-		    : (*pos)->priority >= priority)
+		if (hook->reverse ? (*pos)->priority < priority
+				  : (*pos)->priority >= priority)
 			break;
 
 	he->next = *pos;