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

[Lawrence Stewart]

Author: lstewart
Date: Thu Feb  5 02:06:27 2009
New Revision: 188135
URL: http://svn.freebsd.org/changeset/base/188135

Log:
  Merge r188133 from tcp_cc_8.x

Modified:
  projects/tcp_cc_7.x/sys/   (props changed)
  projects/tcp_cc_7.x/sys/conf/files
  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)

Modified: projects/tcp_cc_7.x/sys/conf/files
==============================================================================
--- projects/tcp_cc_7.x/sys/conf/files	Thu Feb  5 02:01:18 2009	(r188134)
+++ projects/tcp_cc_7.x/sys/conf/files	Thu Feb  5 02:06:27 2009	(r188135)
@@ -1798,8 +1798,6 @@ netinet/ip_options.c		optional inet
 netinet/ip_output.c		optional inet
 netinet/raw_ip.c		optional inet
 netinet/cc.c			optional inet
-netinet/cc_cubic.c		optional inet
-netinet/cc_htcp.c		optional inet
 netinet/sctp_asconf.c		optional inet sctp
 netinet/sctp_auth.c		optional inet sctp
 netinet/sctp_bsd_addr.c		optional inet sctp