From owner-svn-src-head@FreeBSD.ORG  Fri Jun  5 14:31:03 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E1E21065676;
	Fri,  5 Jun 2009 14:31:03 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C3AC8FC1B;
	Fri,  5 Jun 2009 14:31:03 +0000 (UTC)
	(envelope-from rwatson@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 n55EV3jM028548;
	Fri, 5 Jun 2009 14:31:03 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55EV3uE028547;
	Fri, 5 Jun 2009 14:31:03 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906051431.n55EV3uE028547@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 5 Jun 2009 14:31:03 +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: r193510 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jun 2009 14:31:04 -0000

Author: rwatson
Date: Fri Jun  5 14:31:03 2009
New Revision: 193510
URL: http://svn.freebsd.org/changeset/base/193510

Log:
  Unifdef MAC label pointer in syncache entries -- in general, ifdef'd
  structure contents are a bad idea in the kernel for binary
  compatibility reasons, and this is a single pointer that is now included
  in compiles by default anyway due to options MAC being in GENERIC.

Modified:
  head/sys/netinet/tcp_syncache.h

Modified: head/sys/netinet/tcp_syncache.h
==============================================================================
--- head/sys/netinet/tcp_syncache.h	Fri Jun  5 14:29:49 2009	(r193509)
+++ head/sys/netinet/tcp_syncache.h	Fri Jun  5 14:31:03 2009	(r193510)
@@ -74,9 +74,7 @@ struct syncache {
 	struct toe_usrreqs *sc_tu;		/* TOE operations */
 	void 		*sc_toepcb;		/* TOE protocol block */
 #endif			
-#ifdef MAC
 	struct label	*sc_label;		/* MAC label reference */
-#endif
 	struct ucred	*sc_cred;		/* cred cache for jail checks */
 };