---

yaml --- r: 193601 b: refs/heads/master c: dd2acaa h: refs/heads/master i: 193599: 005a552 v: v3
git-mirror · Mar 17, 2010 · 72917a5 · 72917a5
1 parent 177ae41
commit 72917a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb3573dfbca0bd853ddc1e47617eb446fa3deae
+refs/heads/master: dd2acaa7bcb150dadac0b17c8eb654b0712a62ab
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
@@ -587,6 +587,9 @@ choice
 	config DEFAULT_HTCP
 		bool "Htcp" if TCP_CONG_HTCP=y
 
+	config DEFAULT_HYBLA
+		bool "Hybla" if TCP_CONG_HYBLA=y
+
 	config DEFAULT_VEGAS
 		bool "Vegas" if TCP_CONG_VEGAS=y
 
@@ -610,6 +613,7 @@ config DEFAULT_TCP_CONG
 	default "bic" if DEFAULT_BIC
 	default "cubic" if DEFAULT_CUBIC
 	default "htcp" if DEFAULT_HTCP
+	default "hybla" if DEFAULT_HYBLA
 	default "vegas" if DEFAULT_VEGAS
 	default "westwood" if DEFAULT_WESTWOOD
 	default "reno" if DEFAULT_RENO