From owner-svn-src-all@FreeBSD.ORG  Sun Jan 11 20:01:44 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 085D7106564A;
	Sun, 11 Jan 2009 20:01:44 +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 EAF498FC14;
	Sun, 11 Jan 2009 20:01:43 +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 n0BK1hU1037085;
	Sun, 11 Jan 2009 20:01:43 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0BK1how037084;
	Sun, 11 Jan 2009 20:01:43 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200901112001.n0BK1how037084@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 11 Jan 2009 20:01:43 +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: r187062 - head/sys/netinet
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: Sun, 11 Jan 2009 20:01:44 -0000

Author: rwatson
Date: Sun Jan 11 20:01:43 2009
New Revision: 187062
URL: http://svn.freebsd.org/changeset/base/187062

Log:
  Since we allow conditional allocation of labels on syncache entries,
  remove historic assertion that labels are always present.

Modified:
  head/sys/netinet/tcp_syncache.c

Modified: head/sys/netinet/tcp_syncache.c
==============================================================================
--- head/sys/netinet/tcp_syncache.c	Sun Jan 11 19:41:38 2009	(r187061)
+++ head/sys/netinet/tcp_syncache.c	Sun Jan 11 20:01:43 2009	(r187062)
@@ -1070,8 +1070,6 @@ _syncache_add(struct in_conninfo *inc, s
 		 * have an initialized label we can use.
 		 */
 		mac_syncache_destroy(&maclabel);
-		KASSERT(sc->sc_label != NULL,
-		    ("%s: label not initialized", __func__));
 #endif
 		/* Retransmit SYN|ACK and reset retransmit count. */
 		if ((s = tcp_log_addrs(&sc->sc_inc, th, NULL, NULL))) {