Author: bz
Date: Sat Jan 31 12:24:53 2009
New Revision: 187949
URL: http://svn.freebsd.org/changeset/base/187949
Log:
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
Modified:
head/sys/netinet6/ip6_forward.c
Modified: head/sys/netinet6/ip6_forward.c
==============================================================================
--- head/sys/netinet6/ip6_forward.c Sat Jan 31 11:37:21 2009
(r187948)
+++ head/sys/netinet6/ip6_forward.c Sat Jan 31 12:24:53 2009
(r187949)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
