From 72917a544dc926742a43e8df31a66493df0de918 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 11 Mar 2010 09:57:27 +0000 Subject: [PATCH] --- yaml --- r: 193601 b: refs/heads/master c: dd2acaa7bcb150dadac0b17c8eb654b0712a62ab h: refs/heads/master i: 193599: 005a55298025330a7aff80ae5a4df204d464203a v: v3 --- [refs] | 2 +- trunk/net/ipv4/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2c2a8c3008d4..fa6ca4e827f1 100644 --- 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 index 0c94a1ac2946..731c47ba6ad2 100644 --- 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