From owner-svn-src-all@FreeBSD.ORG  Fri Dec 12 16:12:19 2008
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 A44671065672;
	Fri, 12 Dec 2008 16:12:19 +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 933ED8FC12;
	Fri, 12 Dec 2008 16:12:19 +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 mBCGCJeC002311;
	Fri, 12 Dec 2008 16:12:19 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBCGCJsC002310;
	Fri, 12 Dec 2008 16:12:19 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200812121612.mBCGCJsC002310@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 12 Dec 2008 16:12:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185992 - in releng/7.1/sys: . contrib/pf dev/cxgb
	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: Fri, 12 Dec 2008 16:12:19 -0000

Author: rwatson
Date: Fri Dec 12 16:12:19 2008
New Revision: 185992
URL: http://svn.freebsd.org/changeset/base/185992

Log:
  Merge r185929 from stable/7 to releng/7.1:
  
    Merge r185813 from head to stable/7:
  
      Update comment on INP_TIMEWAIT to say what it's about, as we caution
      regarding the misplacement of flags in inp_vflag in an earlier comment.
  
  Approved by:    re (gnn)

Modified:
  releng/7.1/sys/   (props changed)
  releng/7.1/sys/contrib/pf/   (props changed)
  releng/7.1/sys/dev/cxgb/   (props changed)
  releng/7.1/sys/netinet/in_pcb.h

Modified: releng/7.1/sys/netinet/in_pcb.h
==============================================================================
--- releng/7.1/sys/netinet/in_pcb.h	Fri Dec 12 16:09:34 2008	(r185991)
+++ releng/7.1/sys/netinet/in_pcb.h	Fri Dec 12 16:12:19 2008	(r185992)
@@ -410,7 +410,7 @@ void 	inp_4tuple_get(struct inpcb *inp, 
 #define	INP_IPV4	0x1
 #define	INP_IPV6	0x2
 #define	INP_IPV6PROTO	0x4		/* opened under IPv6 protocol */
-#define	INP_TIMEWAIT	0x8		/* .. probably doesn't go here */
+#define	INP_TIMEWAIT	0x8		/* inpcb in TIMEWAIT, ppcb is tcptw */
 #define	INP_ONESBCAST	0x10		/* send all-ones broadcast */
 #define	INP_DROPPED	0x20		/* protocol drop flag */
 #define	INP_SOCKREF	0x40		/* strong socket reference */