From owner-svn-src-all@FreeBSD.ORG  Thu Sep  6 10:10:57 2012
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 A6D071065673;
	Thu,  6 Sep 2012 10:10:57 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9094B8FC0A;
	Thu,  6 Sep 2012 10:10:57 +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 q86AAv34002639;
	Thu, 6 Sep 2012 10:10:57 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q86AAvgA002636;
	Thu, 6 Sep 2012 10:10:57 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201209061010.q86AAvgA002636@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Thu, 6 Sep 2012 10:10:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240161 - stable/8/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: Thu, 06 Sep 2012 10:10:57 -0000

Author: trociny
Date: Thu Sep  6 10:10:56 2012
New Revision: 240161
URL: http://svn.freebsd.org/changeset/base/240161

Log:
  Direct commit to stable/8 to fix the mis-merge in r239983: in 8.x
  read-locking of the inpcbinfo is not used in the TCP timer code.
  
  Reported by:	bz
  Submitted by:	rwatson

Modified:
  stable/8/sys/netinet/tcp_timer.c

Modified: stable/8/sys/netinet/tcp_timer.c
==============================================================================
--- stable/8/sys/netinet/tcp_timer.c	Thu Sep  6 07:48:17 2012	(r240160)
+++ stable/8/sys/netinet/tcp_timer.c	Thu Sep  6 10:10:56 2012	(r240161)
@@ -494,7 +494,7 @@ tcp_timer_rexmt(void * xtp)
 	callout_deactivate(&tp->t_timers->tt_rexmt);
 	if ((inp->inp_flags & INP_DROPPED) != 0) {
 		INP_WUNLOCK(inp);
-		INP_INFO_RUNLOCK(&V_tcbinfo);
+		INP_INFO_WUNLOCK(&V_tcbinfo);
 		CURVNET_RESTORE();
 		return;
 	}