From owner-svn-src-all@FreeBSD.ORG  Sat Jan 31 12:24:53 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D559F106568C;
	Sat, 31 Jan 2009 12:24:53 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C3D2E8FC08;
	Sat, 31 Jan 2009 12:24:53 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0VCOra9024238;
	Sat, 31 Jan 2009 12:24:53 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0VCOr9V024237;
	Sat, 31 Jan 2009 12:24:53 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200901311224.n0VCOr9V024237@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 31 Jan 2009 12:24:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187949 - head/sys/netinet6
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2009 12:24:54 -0000

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;