svn commit: r357814 - head/sys/netinet/tcp_stacks

[Randall Stewart]

Author: rrs
Date: Wed Feb 12 12:36:55 2020
New Revision: 357814
URL: https://svnweb.freebsd.org/changeset/base/357814

Log:
  Now that all of the stats framework is
  in FreeBSD the bits that disabled stats
  when netflix-stats is not defined is no longer
  needed. Lets remove these bits so that we
  will properly use stats per its definition
  in BBR and Rack.
  
  Sponsored by:	Netflix Inc
  Differential Revision:	https://reviews.freebsd.org/D23088

Modified:
  head/sys/netinet/tcp_stacks/rack.c
  head/sys/netinet/tcp_stacks/rack_bbr_common.h

Modified: head/sys/netinet/tcp_stacks/rack.c
==============================================================================
--- head/sys/netinet/tcp_stacks/rack.c	Wed Feb 12 12:23:46 2020	(r357813)
+++ head/sys/netinet/tcp_stacks/rack.c	Wed Feb 12 12:36:55 2020	(r357814)
@@ -1681,7 +1681,7 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *r
 				    tp->t_stats_gput_prev);
 			tp->t_flags &= ~TF_GPUTINPROG;
 			tp->t_stats_gput_prev = gput;
-
+#ifdef NETFLIX_PEAKRATE
 			if (tp->t_maxpeakrate) {
 				/*
 				 * We update t_peakrate_thr. This gives us roughly
@@ -1689,6 +1689,7 @@ rack_ack_received(struct tcpcb *tp, struct tcp_rack *r
 				 */
 				tcp_update_peakrate_thr(tp);
 			}
+#endif
 		}
 #endif
 		if (tp->snd_cwnd > tp->snd_ssthresh) {

Modified: head/sys/netinet/tcp_stacks/rack_bbr_common.h
==============================================================================
--- head/sys/netinet/tcp_stacks/rack_bbr_common.h	Wed Feb 12 12:23:46 2020	(r357813)
+++ head/sys/netinet/tcp_stacks/rack_bbr_common.h	Wed Feb 12 12:36:55 2020	(r357814)
@@ -27,11 +27,6 @@
  * __FBSDID("$FreeBSD$");
  */
 
-/* XXXLAS: Couple STATS to NETFLIX_STATS until stats(3) is fully upstreamed. */
-#ifndef	NETFLIX_STATS
-#undef	STATS
-#endif
-
 /* Common defines and such used by both RACK and BBR */
 /* Special values for mss accounting array */
 #define TCP_MSS_ACCT_JUSTRET 0