From owner-cvs-src-old@FreeBSD.ORG  Thu Jun  3 08:56:01 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81EDC106579A
	for <cvs-src-old@freebsd.org>; Thu,  3 Jun 2010 08:56:01 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 705218FC15
	for <cvs-src-old@freebsd.org>; Thu,  3 Jun 2010 08:56:01 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o538u1nQ047398
	for <cvs-src-old@freebsd.org>; Thu, 3 Jun 2010 08:56:01 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o538u1Xd047397
	for cvs-src-old@freebsd.org; Thu, 3 Jun 2010 08:56:01 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <201006030856.o538u1Xd047397@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rwatson@repoman.freebsd.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 3 Jun 2010 08:55:45 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/netinet ip_divert.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Jun 2010 08:56:01 -0000

rwatson     2010-06-03 08:55:45 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/netinet          ip_divert.c 
  Log:
  SVN rev 208766 on 2010-06-03 08:55:45Z by rwatson
  
  Merge r204810 from head to stable/8:
  
    Remove unnecessary locking of divcbinfo lock from div_output(): this has
    not been required since FreeBSD 7.0 when the so_pcb pointer leading to inp
    was guaranteed to be stable when a valid socket reference is held (as it
    is in the output path).
  
    Reviewed by:  bz
    Sponsored by: Juniper Networks
  
  Approved by:    re (kib)
  
  Revision   Changes    Path
  1.156.2.6  +0 -3      src/sys/netinet/ip_divert.c