From b3bbe5cac1217402e978c8028af7ce35f9cce193 Mon Sep 17 00:00:00 2001
From: bz <bz@FreeBSD.org>
Date: Sat, 31 Jan 2009 12:24:53 +0000
Subject: Coalesce two consecutive #ifdef IPSEC blocks. Move the skip_ipsec:
 label below the goto as we can never have ipsecrt set if we get to that label
 so there is no need to check.

MFC after:	2 weeks
---
 sys/netinet6/ip6_forward.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sys')

diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index db0094c..0ce591f 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -350,12 +350,9 @@ ip6_forward(struct mbuf *m, int srcrt)
 	if (dst != NULL && rt != NULL)
 		ipsecrt = 1;
     }
-    skip_ipsec:
-#endif /* IPSEC */
-
-#ifdef IPSEC
 	if (ipsecrt)
 		goto skip_routing;
+skip_ipsec:
 #endif
 
 	dst = (struct sockaddr_in6 *)&V_ip6_forward_rt.ro_dst;
-- 
cgit v1.1