svn commit: r185992 - in releng/7.1/sys: . contrib/pf dev/cxgb netinet

[Robert Watson]

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 */