add BBR_powered, delete BBR2

linhua55 · Jul 2, 2017 · f8e939f · f8e939f
1 parent bbcb929
commit f8e939f
Show file tree

Hide file tree

Showing 5 changed files with 912 additions and 941 deletions.
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
@@ -663,12 +663,12 @@ config TCP_CONG_BBR
 	bufferbloat, policers, or AQM schemes that do not provide a delay
 	signal. It requires the fq ("Fair Queue") pacing packet scheduler.
 
-config TCP_CONG_BBR2
-	tristate "BBR2 TCP"
+config TCP_CONG_BBR_POWERED
+	tristate "BBR_POWERED TCP"
 	default n
 	---help---
 
-    BBR2 congestion control
+    BBR_POWERED congestion control
 
 config TCP_CONG_PCC
 	tristate "PCC TCP"
@@ -714,8 +714,8 @@ choice
 	config DEFAULT_BBR
 		bool "BBR" if TCP_CONG_BBR=y
 
-	config DEFAULT_BBR2
-		bool "BBR2" if TCP_CONG_BBR2=y
+	config DEFAULT_BBR_POWERED
+		bool "BBR_POWERED" if TCP_CONG_BBR_POWERED=y
 
 	config DEFAULT_PCC
 		bool "PCC" if TCP_CONG_PCC=y
@@ -744,7 +744,7 @@ config DEFAULT_TCP_CONG
 	default "dctcp" if DEFAULT_DCTCP
 	default "cdg" if DEFAULT_CDG
 	default "bbr" if DEFAULT_BBR
-	default "bbr2" if DEFAULT_BBR2
+	default "bbr_powered" if DEFAULT_BBR_POWERED
 	default "TA" if DEFAULT_PCC
 	default "cubic"
 

diff --git a/net/ipv4/Makefile b/net/ipv4/Makefile
@@ -43,7 +43,7 @@ obj-$(CONFIG_INET_UDP_DIAG) += udp_diag.o
 obj-$(CONFIG_INET_RAW_DIAG) += raw_diag.o
 obj-$(CONFIG_NET_TCPPROBE) += tcp_probe.o
 obj-$(CONFIG_TCP_CONG_BBR) += tcp_bbr.o
-obj-$(CONFIG_TCP_CONG_BBR2) += tcp_bbr2.o
+obj-$(CONFIG_TCP_CONG_BBR_POWERED) += tcp_bbr_powered.o
 obj-$(CONFIG_TCP_CONG_PCC) += tcp_TA.o
 obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o
 obj-$(CONFIG_TCP_CONG_CDG) += tcp_cdg.o

diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c
@@ -786,7 +786,6 @@ static void bbr_main(struct sock *sk, const struct rate_sample *rs)
 {
 	struct bbr *bbr = inet_csk_ca(sk);
 	u32 bw;
-    //printk("BBRsdfasdfasdf\n");
 
 	bbr_update_model(sk, rs);
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     	struct bbr *bbr = inet_csk_ca(sk);
     	u32 bw;
-        //printk("BBRsdfasdfasdf\n");
     	bbr_update_model(sk, rs);
@@ Expand Down @@