svn commit: r240161 - stable/8/sys/netinet

[Mikolaj Golub]

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;
 	}