svn commit: r191186 - in projects/tcp_cc_7.x/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netinet

[Lawrence Stewart]

Author: lstewart
Date: Fri Apr 17 02:52:23 2009
New Revision: 191186
URL: http://svn.freebsd.org/changeset/base/191186

Log:
  Merge r191185 from projects/tcp_cc_8.x

Modified:
  projects/tcp_cc_7.x/sys/   (props changed)
  projects/tcp_cc_7.x/sys/contrib/pf/   (props changed)
  projects/tcp_cc_7.x/sys/dev/ath/ath_hal/   (props changed)
  projects/tcp_cc_7.x/sys/dev/cxgb/   (props changed)
  projects/tcp_cc_7.x/sys/netinet/cc.c

Modified: projects/tcp_cc_7.x/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_7.x/sys/netinet/cc.c	Fri Apr 17 02:46:31 2009	(r191185)
+++ projects/tcp_cc_7.x/sys/netinet/cc.c	Fri Apr 17 02:52:23 2009	(r191186)
@@ -185,7 +185,7 @@ cc_deregister_algorithm(struct cc_algo *
 		INP_INFO_RLOCK(&tcbinfo);
 		LIST_FOREACH(inp, &tcb, inp_list) {
 			/* skip tcptw structs */
-			if (inp->inp_vflag & INP_TIMEWAIT)
+			if (inp->inp_flags & INP_TIMEWAIT)
 				continue;
 			INP_WLOCK(inp);
 			if ((tp = intotcpcb(inp)) != NULL) {