git: 2e6b07866f9e - main - libalias: Ensure ASSERT behind varable declarations

[Lutz Donnerhacke]

The branch main has been updated by donner:

URL: https://cgit.FreeBSD.org/src/commit/?id=2e6b07866f9e1520626a1523f6609cc411bdda1c

commit 2e6b07866f9e1520626a1523f6609cc411bdda1c
Author:     Lutz Donnerhacke <donner at FreeBSD.org>
AuthorDate: 2021-05-15 22:49:11 +0000
Commit:     Lutz Donnerhacke <donner at FreeBSD.org>
CommitDate: 2021-05-16 00:28:36 +0000

    libalias: Ensure ASSERT behind varable declarations
    
    At some places the ASSERT was inserted before variable declarations are
    finished.  This is fixed now.
    
    Reported by:    kib
    Reviewed by:    kib
    MFC after:      1 week
    Differential Revision: https://reviews.freebsd.org/D30282
---
 sys/netinet/libalias/alias.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c
index cac19ab55d56..0e2756affcb4 100644
--- a/sys/netinet/libalias/alias.c
+++ b/sys/netinet/libalias/alias.c
@@ -290,10 +290,10 @@ static int	TcpAliasOut(struct libalias *, struct ip *, int, int create);
 static int
 IcmpAliasIn1(struct libalias *la, struct ip *pip)
 {
-	LIBALIAS_LOCK_ASSERT(la);
 	struct alias_link *lnk;
 	struct icmp *ic;
 
+	LIBALIAS_LOCK_ASSERT(la);
 	ic = (struct icmp *)ip_next(pip);
 
 	/* Get source address from ICMP data field and restore original data */
@@ -334,13 +334,13 @@ IcmpAliasIn1(struct libalias *la, struct ip *pip)
 static int
 IcmpAliasIn2(struct libalias *la, struct ip *pip)
 {
-	LIBALIAS_LOCK_ASSERT(la);
 	struct ip *ip;
 	struct icmp *ic, *ic2;
 	struct udphdr *ud;
 	struct tcphdr *tc;
 	struct alias_link *lnk;
 
+	LIBALIAS_LOCK_ASSERT(la);
 	ic = (struct icmp *)ip_next(pip);
 	ip = &ic->icmp_ip;