svn commit: r185929 - in stable/7/sys: . contrib/pf dev/cxgb netinet

[Robert Watson]

Author: rwatson
Date: Thu Dec 11 12:44:28 2008
New Revision: 185929
URL: http://svn.freebsd.org/changeset/base/185929

Log:
  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:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/in_pcb.h

Modified: stable/7/sys/netinet/in_pcb.h
==============================================================================
--- stable/7/sys/netinet/in_pcb.h	Thu Dec 11 10:29:35 2008	(r185928)
+++ stable/7/sys/netinet/in_pcb.h	Thu Dec 11 12:44:28 2008	(r185929)
@@ -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 */