From patchwork Thu Mar 11 19:57:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 47631 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8888F102497 for ; Fri, 12 Mar 2010 06:58:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753235Ab0CKT5h (ORCPT ); Thu, 11 Mar 2010 14:57:37 -0500 Received: from borg.medozas.de ([188.40.89.202]:56842 "EHLO borg.medozas.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752927Ab0CKT5f (ORCPT ); Thu, 11 Mar 2010 14:57:35 -0500 Received: by borg.medozas.de (Postfix, from userid 25121) id 2BAADF0C2EBE1; Thu, 11 Mar 2010 20:57:34 +0100 (CET) From: Jan Engelhardt To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH 1/3] net: tcp: make hybla selectable as default congestion module Date: Thu, 11 Mar 2010 20:57:27 +0100 Message-Id: <1268337450-6749-2-git-send-email-jengelh@medozas.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1268337450-6749-1-git-send-email-jengelh@medozas.de> References: <1268337450-6749-1-git-send-email-jengelh@medozas.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jan Engelhardt --- net/ipv4/Kconfig | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 0c94a1a..731c47b 100644 --- a/net/ipv4/Kconfig +++ b/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