From owner-svn-src-user@FreeBSD.ORG  Sun Oct 21 08:09:09 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A4A23D39;
 Sun, 21 Oct 2012 08:09:09 +0000 (UTC)
 (envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 898848FC12;
 Sun, 21 Oct 2012 08:09:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9L899QY022837;
 Sun, 21 Oct 2012 08:09:09 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9L899FP022835;
 Sun, 21 Oct 2012 08:09:09 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201210210809.q9L899FP022835@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sun, 21 Oct 2012 08:09:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r241795 - user/andre/tcp_workqueue/sys/netinet
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Oct 2012 08:09:09 -0000

Author: andre
Date: Sun Oct 21 08:09:09 2012
New Revision: 241795
URL: http://svn.freebsd.org/changeset/base/241795

Log:
  Fix mismerge from last integrate in r241732.

Modified:
  user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c

Modified: user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c
==============================================================================
--- user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c	Sun Oct 21 04:02:34 2012	(r241794)
+++ user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c	Sun Oct 21 08:09:09 2012	(r241795)
@@ -966,7 +966,6 @@ syncache_expand(struct in_conninfo *inc,
 			tod->tod_syncache_removed(tod, sc->sc_todctx);
 		}
 #endif
-		V_tcp_syncache.cache_count--;
 		SCH_UNLOCK(sch);
 	}