CUBIC v2.3 with new improved slow start

PATCH In review Injong Rhee 6 participants 20 messages Oct 29, 2008 – Nov 4, 2008

Subsystems (15)

Networking Network drivers Arm (32-bit) x86 +11 more subsystems

lore

Share & tools

lore

Injong Rhee

author

2008-10-29 21:45 UTC #0 lore raw

PATCH 1/1 CUBIC v2.3 with new improved slow start

I am releasing a new patch for CUBIC. This patch implements a new slow start mechanism called HyStart. There were some discussions in the mailing list on the poor performance of TCP slow start; our patch addresses those performance issues arising from slow start. For more information, please refer to the following technical report:

Sangtae Ha and Injong Rhee, "Taming the Elephants: New TCP Slow Start", NCSU Technical Report 2008. Available at
http://netsrv.csc.ncsu.edu/export/hystart_techreport_2008.pdf

The new update improves the start-up throughput of CUBIC substantially by avoiding system overloading during slow start and shortening the fast-recovery period after slow start. The key performance issues arising when Linux is used with Windows XP or FreeBSD receivers are also addressed. Our tests over Internet2 paths are very encouraging. The scheme is verified to work well even for asymmetric paths, with diverse receiver settings of delayed acknowledgements, and with various operating systems (Windows XP and FreeBSD). You can find the testing results from

http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing

Please let us know if there are other performance issues of TCP that you want us to look into.

Injong and Sangtae.

Quoted 1 line

From ee61f3e3f5aee0707eac02cd8cec2ab37e7114ee Mon Sep 17 00:00:00 2001

From: Sangtae Ha <[email protected]>
Date: Wed, 29 Oct 2008 00:07:18 -0400
Subject: [PATCH] [TCP] CUBIC v2.3

Signed-off-by Sangtae Ha <[email protected]>

---
 net/ipv4/tcp_cubic.c |  120 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 109 insertions(+), 11 deletions(-)

net/ipv4/tcp_cubic.c +109 ~~-11~~

index 4a1221e..ee467ec 100644
@@ -1,13 +1,23 @@
 /*
- * TCP CUBIC: Binary Increase Congestion control for TCP v2.2
+ * TCP CUBIC: Binary Increase Congestion control for TCP v2.3
  * Home page:
  *      http://netsrv.csc.ncsu.edu/twiki/bin/view/Main/BIC
  * This is from the implementation of CUBIC TCP in
- * Injong Rhee, Lisong Xu.
- *  "CUBIC: A New TCP-Friendly High-Speed TCP Variant
- *  in PFLDnet 2005
+ * Sangtae Ha, Injong Rhee and Lisong Xu,
+ *  "CUBIC: A New TCP-Friendly High-Speed TCP Variant"
+ *  in ACM SIGOPS Operating System Review, July 2008.
  * Available from:
- *  http://netsrv.csc.ncsu.edu/export/cubic-paper.pdf
+ *  http://netsrv.csc.ncsu.edu/export/cubic_a_new_tcp_2008.pdf
+ *
+ * CUBIC integrates a new slow start algorithm, called HyStart.
+ * The details of HyStart are presented in
+ *  Sangtae Ha and Injong Rhee,
+ *  "Taming the Elephants: New TCP Slow Start", NCSU TechReport 2008.
+ * Available from:
+ *  http://netsrv.csc.ncsu.edu/export/hystart_techreport_2008.pdf
+ *
+ * All testing results are available from:
+ * http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing
  *
  * Unless CUBIC is enabled and congestion window is large
  * this behaves the same as the original Reno.

@@ -23,12 +33,26 @@
 					 */
 #define	BICTCP_HZ		10	/* BIC HZ 2^10 = 1024 */
 
+/* Two methods of hybrid slow start */
+#define HYSTART_ACK_TRAIN	0x1
+#define HYSTART_DELAY		0x2
+
+/* Number of delay samples for detecting the increase of delay */
+#define HYSTART_MIN_SAMPLES	8
+#define HYSTART_DELAY_MIN	(2U<<3)
+#define HYSTART_DELAY_MAX	(16U<<3)
+#define HYSTART_DELAY_THRESH(x)	clamp(x, HYSTART_DELAY_MIN, HYSTART_DELAY_MAX)
+
 static int fast_convergence __read_mostly = 1;
 static int beta __read_mostly = 717;	/* = 717/1024 (BICTCP_BETA_SCALE) */
 static int initial_ssthresh __read_mostly;
 static int bic_scale __read_mostly = 41;
 static int tcp_friendliness __read_mostly = 1;
 
+static int hystart __read_mostly = 1;
+static int hystart_detect __read_mostly = HYSTART_ACK_TRAIN | HYSTART_DELAY;
+static int hystart_low_window __read_mostly = 16;
+
 static u32 cube_rtt_scale __read_mostly;
 static u32 beta_scale __read_mostly;
 static u64 cube_factor __read_mostly;

@@ -44,6 +68,13 @@ module_param(bic_scale, int, 0444);
 MODULE_PARM_DESC(bic_scale, "scale (scaled by 1024) value for bic function (bic_scale/1024)");
 module_param(tcp_friendliness, int, 0644);
 MODULE_PARM_DESC(tcp_friendliness, "turn on/off tcp friendliness");
+module_param(hystart, int, 0644);
+MODULE_PARM_DESC(hystart, "turn on/off hybrid slow start algorithm");
+module_param(hystart_detect, int, 0644);
+MODULE_PARM_DESC(hystart_detect, "hyrbrid slow start detection mechanisms"
+		 " 1: packet-train 2: delay 3: both packet-train and delay");
+module_param(hystart_low_window, int, 0644);
+MODULE_PARM_DESC(hystart_low_window, "lower bound cwnd for hybrid slow start");
 
 /* BIC TCP Parameters */
 struct bictcp {

@@ -59,7 +90,13 @@ struct bictcp {
 	u32	ack_cnt;	/* number of acks */
 	u32	tcp_cwnd;	/* estimated tcp cwnd */
 #define ACK_RATIO_SHIFT	4
-	u32	delayed_ack;	/* estimate the ratio of Packets/ACKs << 4 */
+	u16	delayed_ack;	/* estimate the ratio of Packets/ACKs << 4 */
+	u8	sample_cnt;	/* number of samples to decide curr_rtt */
+	u8	found;		/* the exit point is found? */
+	u32	round_start;	/* beginning of each round */
+	u32	end_seq;	/* end_seq of the round */
+	u32	last_jiffies;	/* last time when the ACK spacing is close */
+	u32	curr_rtt;	/* the minimum rtt of current round */
 };
 
 static inline void bictcp_reset(struct bictcp *ca)

@@ -76,12 +113,28 @@ static inline void bictcp_reset(struct bictcp *ca)
 	ca->delayed_ack = 2 << ACK_RATIO_SHIFT;
 	ca->ack_cnt = 0;
 	ca->tcp_cwnd = 0;
+	ca->found = 0;
+}
+
+static inline void bictcp_hystart_reset(struct sock *sk)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	struct bictcp *ca = inet_csk_ca(sk);
+
+	ca->round_start = ca->last_jiffies = jiffies;
+	ca->end_seq = tp->snd_nxt;
+	ca->curr_rtt = 0;
+	ca->sample_cnt = 0;
 }
 
 static void bictcp_init(struct sock *sk)
 {
 	bictcp_reset(inet_csk_ca(sk));
-	if (initial_ssthresh)
+
+	if (hystart)
+		bictcp_hystart_reset(sk);
+
+	if (!hystart && initial_ssthresh)
 		tcp_sk(sk)->snd_ssthresh = initial_ssthresh;
 }

@@ -235,9 +288,11 @@ static void bictcp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
 	if (!tcp_is_cwnd_limited(sk, in_flight))
 		return;
 
-	if (tp->snd_cwnd <= tp->snd_ssthresh)
+	if (tp->snd_cwnd <= tp->snd_ssthresh) {
+		if (hystart && after(ack, ca->end_seq))
+			bictcp_hystart_reset(sk);
 		tcp_slow_start(tp);
-	else {
+	} else {
 		bictcp_update(ca, tp->snd_cwnd);
 
 		/* In dangerous area, increase slowly.

@@ -281,8 +336,45 @@ static u32 bictcp_undo_cwnd(struct sock *sk)
 
 static void bictcp_state(struct sock *sk, u8 new_state)
 {
-	if (new_state == TCP_CA_Loss)
+	if (new_state == TCP_CA_Loss) {
 		bictcp_reset(inet_csk_ca(sk));
+		bictcp_hystart_reset(sk);
+	}
+}
+
+static void hystart_update(struct sock *sk, u32 delay)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	struct bictcp *ca = inet_csk_ca(sk);
+
+	if (!(ca->found & hystart_detect)) {
+		u32 curr_jiffies = jiffies;
+
+		/* first detection parameter - ack-train detection */
+		if (curr_jiffies - ca->last_jiffies <= msecs_to_jiffies(2)) {
+			ca->last_jiffies = curr_jiffies;
+			if (curr_jiffies - ca->round_start >= ca->delay_min>>4)
+				ca->found |= HYSTART_ACK_TRAIN;
+		}
+
+		/* obtain the minimum delay of more than sampling packets */
+		if (ca->sample_cnt < HYSTART_MIN_SAMPLES) {
+			if (ca->curr_rtt == 0 || ca->curr_rtt > delay)
+				ca->curr_rtt = delay;
+
+			ca->sample_cnt++;
+		} else {
+			if (ca->curr_rtt > ca->delay_min +
+			    HYSTART_DELAY_THRESH(ca->delay_min>>4))
+				ca->found |= HYSTART_DELAY;
+		}
+		/*
+		 * Either one of two conditions are met,
+		 * we exit from slow start immediately.
+		 */
+		if (ca->found & hystart_detect)
+			tp->snd_ssthresh = tp->snd_cwnd;
+	}
 }
 
 /* Track delayed acknowledgment ratio using sliding window

@@ -291,6 +383,7 @@ static void bictcp_state(struct sock *sk, u8 new_state)
 static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt_us)
 {
 	const struct inet_connection_sock *icsk = inet_csk(sk);
+	const struct tcp_sock *tp = tcp_sk(sk);
 	struct bictcp *ca = inet_csk_ca(sk);
 	u32 delay;

@@ -314,6 +407,11 @@ static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt_us)
 	/* first time call or link delay decreases */
 	if (ca->delay_min == 0 || ca->delay_min > delay)
 		ca->delay_min = delay;
+
+	/* hystart triggers when cwnd is larger than some threshold */
+	if (hystart && tp->snd_cwnd <= tp->snd_ssthresh &&
+	    tp->snd_cwnd >= hystart_low_window)
+		hystart_update(sk, delay);
 }
 
 static struct tcp_congestion_ops cubictcp = {

@@ -372,4 +470,4 @@ module_exit(cubictcp_unregister);
 MODULE_AUTHOR("Sangtae Ha, Stephen Hemminger");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("CUBIC TCP");
-MODULE_VERSION("2.2");
+MODULE_VERSION("2.3");

Signature · 1 line

1.5.2.2

Stephen Hemminger

2008-10-29 22:39 UTC #1 lore raw

Quoted 20 lines · On Wed, 29 Oct 2008 17:28:26 -0400 "Injong Rhee" <[email protected]> wrote:

I am releasing a new patch for CUBIC. This patch implements a new slow start mechanism called HyStart. There were some discussions in the mailing list on the poor performance of TCP slow start; our patch addresses those performance issues arising from slow start. For more information, please refer to the following technical report:
Sangtae Ha and Injong Rhee, "Taming the Elephants: New TCP Slow
Start", NCSU Technical Report 2008. Available at
http://netsrv.csc.ncsu.edu/export/hystart_techreport_2008.pdf
The new update improves the start-up throughput of CUBIC substantially by avoiding system overloading during slow start and shortening the fast-recovery period after slow start. The key performance issues arising when Linux is used with Windows XP or FreeBSD receivers are also addressed. Our tests over Internet2 paths are very encouraging. The scheme is verified to work well even for asymmetric paths, with diverse receiver settings of delayed acknowledgements, and with various operating systems (Windows XP and FreeBSD). You can find the testing results from

Quoted 7 lines

http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing
Please let us know if there are other performance issues of TCP that you want us to look into.
Injong and Sangtae.

This looks like a good optimization, it obviously needs more testing because Linux always seems to find new broken hardware. The areas that need to be tested should include:
* MacOs has a broken version of delayed ack that might cause HyStart to radically underestimate.
* Applications that dribble out packets might get better (or worse) performance. This include dumb web servers.
* Does this increase or reduce latency when using TCP for applications which never fill the congestion window? (games, financial, etc).

Injong Rhee

2008-10-29 23:14 UTC #2 lore raw

Quoted 6 lines

This looks like a good optimization, it obviously needs more testing because Linux always seems to find new broken hardware. The areas that need to be tested should include:
* MacOs has a broken version of delayed ack that might cause HyStart to radically underestimate.

We tested with FreeBSD. I presume that it covers MacOS. We will look into that.

Quoted 2 lines

* Applications that dribble out packets might get better (or worse) performance. This include dumb web servers.

Not really. It does not affect those flows that do not use their full capacity of the network. HyStart kicks in only when the flow are using more than avail bw during slow start. If the applications do not pump data in, it would still be in slow start -- while in slow start, HyStart works like the traditional slow start (double cwnd per rtt).

Quoted 4 lines

* Does this increase or reduce latency when using TCP for applications which never fill the congestion window? (games, financial,
etc).

For the same reasons as above, No, HyStart does not engage in this situation.

Stephen Hemminger

2008-10-29 23:40 UTC #3 lore raw

Quoted 9 lines · On Wed, 29 Oct 2008 19:14:03 -0400 "Injong Rhee" <[email protected]> wrote:

Quoted 6 lines
This looks like a good optimization, it obviously needs more testing because Linux always seems to find new broken hardware. The areas that need to be tested should include:
* MacOs has a broken version of delayed ack that might cause HyStart to radically underestimate.
We tested with FreeBSD. I presume that it covers MacOS. We will look into that.

No Darwin added some stupid code that holds off acks for up to 2 seconds.

Quoted 9 lines

Quoted 2 lines
* Applications that dribble out packets might get better (or worse) performance. This include dumb web servers.
Not really. It does not affect those flows that do not use their full capacity of the network. HyStart kicks in only when the flow are using more than avail bw during slow start. If the applications do not pump data in, it would still be in slow start -- while in slow start, HyStart works like the traditional slow start (double cwnd per rtt).

Quoted 8 lines

Quoted 4 lines
* Does this increase or reduce latency when using TCP for applications which never fill the congestion window? (games, financial,
etc).
For the same reasons as above, No, HyStart does not engage in this situation.

Rick Jones

2008-10-29 23:53 UTC #4 lore raw

Quoted 10 lines · Stephen Hemminger

Quoted 6 lines · On Wed, 29 Oct 2008 19:14:03 -0400 "Injong Rhee" <[email protected]> wrote:
Quoted 5 lines
This looks like a good optimization, it obviously needs more testing because Linux always seems to find new broken hardware. The areas that need to be tested should include:
* MacOs has a broken version of delayed ack that might cause HyStart to radically underestimate.

Quoted 4 lines

Quoted 1 line
We tested with FreeBSD. I presume that it covers MacOS. We will look into that.
No Darwin added some stupid code that holds off acks for up to 2 seconds.

Is this Apple's reimplementation of the ACK avoidance heuristics in OSX they used to have in previous versions of MacOS with the Mentat TCP/IP stack?

FWIW, HP-UX and Solaris also have ACK avoidance heursistics - they have a Mentat history - although both should be pretty good and neither should hold-off ACKs for two seconds...

rick jones

Rick Jones

2008-10-30 01:08 UTC #5 lore raw

Quoted 1 line

FWIW, HP-UX and Solaris also have ACK avoidance heursistics - they have a Mentat history - although both should be pretty good and neither should hold-off ACKs for two seconds...

IIRC the last time I looked at a packet trace from a link with LRO enabled under "Linux," that too caused "ACK avoidance" - that is we stray from the "ACK every other" faith.

rick jones

Injong Rhee

2008-10-30 01:39 UTC #6 lore raw

In reply to Rick Jones

In any situation where delayed acks screw things up, HyStart would work exactly like the old slow start. No harm is done. Since those long delayed acks are simply filtered out, HyStart would not detect the exit points correctly -- in this particular case, it would delay the exit point until packet losses occur. Then this is the behavior of the old slow start.

If some bad implementation causes HyStart to exit from slow start too early (before the full utilization of the network), then it can be a problem. But we have not found that case. Even over asymmetric paths, premature exits do not occur (well based on our own def of premature exits, of course).

----- Original Message ----- From: "Rick Jones" <[email protected]>
To: "Stephen Hemminger" <[email protected]>
Cc: "Injong Rhee" <[email protected]>; "Injong Rhee" <[email protected]>; <[email protected]>
Sent: Wednesday, October 29, 2008 7:53 PM
Subject: Re: [PATCH] CUBIC v2.3 with new improved slow start

Quoted 22 lines

Quoted 10 lines · Stephen Hemminger
Quoted 6 lines · On Wed, 29 Oct 2008 19:14:03 -0400 "Injong Rhee" <[email protected]> wrote:
Quoted 5 lines
This looks like a good optimization, it obviously needs more testing because Linux always seems to find new broken hardware. The areas that need to be tested should include:
* MacOs has a broken version of delayed ack that might cause HyStart to radically underestimate.
Quoted 4 lines
Quoted 1 line
We tested with FreeBSD. I presume that it covers MacOS. We will look into that.
No Darwin added some stupid code that holds off acks for up to 2 seconds.
Is this Apple's reimplementation of the ACK avoidance heuristics in OSX they used to have in previous versions of MacOS with the Mentat TCP/IP stack?
FWIW, HP-UX and Solaris also have ACK avoidance heursistics - they have a Mentat history - although both should be pretty good and neither should hold-off ACKs for two seconds...
rick jones

David Miller

maintainer

2008-10-29 23:45 UTC #7 lore raw

In reply to Injong Rhee

From: "Injong Rhee" <[email protected]>
Date: Wed, 29 Oct 2008 19:14:03 -0400

Quoted 8 lines

Quoted 6 lines
This looks like a good optimization, it obviously needs more testing because Linux always seems to find new broken hardware. The areas that need to be tested should include:
* MacOs has a broken version of delayed ack that might cause HyStart to radically underestimate.
We tested with FreeBSD. I presume that it covers MacOS. We will look into that.

Not even close, Apple made an enormous number of local modifications to the BSD tcp stack in their copy of the code base.

That's where the dupack behavior comes from, FreeBSD never did that stuff.

Stephen Hemminger

2008-10-30 15:36 UTC #8 lore raw

PATCH 1/1 tcp: mark BIC as experimental

In reply to Injong Rhee

Change the configuration defaults to mark BIC as experimental. BIC is too aggressive and was replaced by CUBIC. Debian was picking BIC in their default config (should be fixed by now), but the configuration documentation did not make it explicit that this was a bad idea.

Also update the URLs in the configuration documentation to current locations.

Signed-off-by Stephen Hemminger <[email protected]>

net/ipv4/Kconfig +15 -9

@@ -437,7 +437,8 @@ if TCP_CONG_ADVANCED
 
 config TCP_CONG_BIC
 	tristate "Binary Increase Congestion (BIC) control"
-	default m
+	depends on EXPERIMENTAL
+	default n
 	---help---
 	BIC-TCP is a sender-side only change that ensures a linear RTT
 	fairness under large windows while offering both scalability and

@@ -447,15 +448,24 @@ config TCP_CONG_BIC
 	increment ensures linear RTT fairness as well as good
 	scalability. Under small congestion windows, binary search
 	increase provides TCP friendliness.
-	See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/
+
+	BIC growth function is too aggressive and should not be used
+	except for testing and comparision, use CUBIC instead.
+
+	For further details see:
+           http://netsrv.csc.ncsu.edu/twiki/bin/view/Main/BIC
 
 config TCP_CONG_CUBIC
 	tristate "CUBIC TCP"
 	default y
 	---help---
-	This is version 2.0 of BIC-TCP which uses a cubic growth function
-	among other techniques.
-	See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/cubic-paper.pdf
+	CUBIC TCP is an sender-side only modification to the congestion control
+	algothrim improved versions on the growth function of BIC and has an
+	improved slow start algoritm, called HyStart.
+
+	For further details see:
+           http://netsrv.csc.ncsu.edu/twiki/bin/view/Main/BIC
+
 
 config TCP_CONG_WESTWOOD
 	tristate "TCP Westwood+"

@@ -581,9 +591,6 @@ choice
 	  Select the TCP congestion control that will be used by default
 	  for all connections.
 
-	config DEFAULT_BIC
-		bool "Bic" if TCP_CONG_BIC=y
-
 	config DEFAULT_CUBIC
 		bool "Cubic" if TCP_CONG_CUBIC=y

@@ -610,7 +617,6 @@ config TCP_CONG_CUBIC
 
 config DEFAULT_TCP_CONG
 	string
-	default "bic" if DEFAULT_BIC
 	default "cubic" if DEFAULT_CUBIC
 	default "htcp" if DEFAULT_HTCP
 	default "vegas" if DEFAULT_VEGAS

David Miller

maintainer

2008-10-31 07:50 UTC #9 lore raw

Re: [PATCH] tcp: mark BIC as experimental

From: Stephen Hemminger <[email protected]>
Date: Thu, 30 Oct 2008 08:36:41 -0700

Quoted 9 lines

Change the configuration defaults to mark BIC as experimental. BIC is too aggressive and was replaced by CUBIC. Debian was picking BIC in their default config (should be fixed by now), but the configuration documentation did not make it explicit that this was a bad idea.
Also update the URLs in the configuration documentation to current locations.
Signed-off-by Stephen Hemminger <[email protected]>

I understand your intention, but I'm not so sure we should do this.

It's more than a double standard to make this change, yet still allow things like HTCP to still be a default.

And you can't even make this selection without asking for
TCP_CONG_ADVANCED. Well... duh!

Stephen Hemminger

2008-10-31 16:41 UTC #10 lore raw

Re: [PATCH] tcp: mark BIC as experimental

Quoted 13 lines · On Fri, 31 Oct 2008 00:50:33 -0700 (PDT) David Miller <[email protected]>…

From: Stephen Hemminger <[email protected]>
Date: Thu, 30 Oct 2008 08:36:41 -0700
Quoted 9 lines
Change the configuration defaults to mark BIC as experimental. BIC is too aggressive and was replaced by CUBIC. Debian was picking BIC in their default config (should be fixed by now), but the configuration documentation did not make it explicit that this was a bad idea.
Also update the URLs in the configuration documentation to current locations.
Signed-off-by Stephen Hemminger <[email protected]>

Quoted 7 lines

I understand your intention, but I'm not so sure we should do this.
It's more than a double standard to make this change, yet still allow things like HTCP to still be a default.
And you can't even make this selection without asking for
TCP_CONG_ADVANCED. Well... duh!

Some architectures were setting TCP_CONG_ADVANCED and choosing BIC

arch/arm/configs/at91rm9200dk_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/at91rm9200ek_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/ateb9200_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/collie_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/kafa_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/kb9202_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/ks8695_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/lpd7a404_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/netx_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/pnx4008_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/realview_defconfig:CONFIG_TCP_CONG_BIC=y arch/arm/configs/versatile_defconfig:CONFIG_TCP_CONG_BIC=y arch/ia64/configs/bigsur_defconfig:CONFIG_TCP_CONG_BIC=y arch/ia64/configs/gensparse_defconfig:CONFIG_TCP_CONG_BIC=y arch/ia64/configs/sim_defconfig:CONFIG_TCP_CONG_BIC=y arch/mips/configs/bcm47xx_defconfig:CONFIG_TCP_CONG_BIC=y arch/mips/configs/rb532_defconfig:CONFIG_TCP_CONG_BIC=m arch/mips/configs/tb0287_defconfig:CONFIG_TCP_CONG_BIC=y arch/powerpc/configs/ppc6xx_defconfig:CONFIG_TCP_CONG_BIC=m

David Miller

maintainer

2008-10-31 19:04 UTC #11 lore raw

Re: [PATCH] tcp: mark BIC as experimental

From: Stephen Hemminger <[email protected]>
Date: Fri, 31 Oct 2008 09:41:13 -0700

Quoted 18 lines

Quoted 15 lines · On Fri, 31 Oct 2008 00:50:33 -0700 (PDT) David Miller <[email protected]>…
From: Stephen Hemminger <[email protected]>
Date: Thu, 30 Oct 2008 08:36:41 -0700
Quoted 9 lines
Change the configuration defaults to mark BIC as experimental. BIC is too aggressive and was replaced by CUBIC. Debian was picking BIC in their default config (should be fixed by now), but the configuration documentation did not make it explicit that this was a bad idea.
Also update the URLs in the configuration documentation to current locations.
Signed-off-by Stephen Hemminger <[email protected]>
I understand your intention, but I'm not so sure we should do this.

Quoted 7 lines

Quoted 5 lines
It's more than a double standard to make this change, yet still allow things like HTCP to still be a default.
And you can't even make this selection without asking for
TCP_CONG_ADVANCED. Well... duh!
Some architectures were setting TCP_CONG_ADVANCED and choosing BIC

I'm sure you can find a pile of other nonsense settings in the arch defconfigs if you keep looking. And those should be similarly fixed, but in the arch defconfigs.

But that has no bearing on what we're discussing here.

Stephen Hemminger

2008-10-31 19:16 UTC #12 lore raw

RFC 1/1 tcp: make H-TCP the default congestion control

In reply to David Miller

The new version of CUBIC is not as tested as H-TCP. Therefore it is prudent to make H-TCP the default congestion control for one (or more) releases until the new HyStart code has been real world tested.

This is likely to generate interesting discussion and testing. Both H-TCP and CUBIC are robust. For most users, there will be no perceivable difference, but for users with excessively large queues (DSL ISPs) H-TCP is more fair. One CUBIC flow fills the queue, and the second flow never pushes hard enough to cause fairness.

For researchers with very high speed networks
with switches with minuscule queues, CUBIC works better. H-TCP sees the packet loss from the small queue and reduces sending rate.

Signed-off-by Stephen Hemminger <[email protected]>

net/ipv4/Kconfig +9 -9

@@ -429,7 +429,7 @@ menuconfig TCP_CONG_ADVANCED
 	  modules.
 
 	  Nearly all users can safely say no here, and a safe default
-	  selection will be made (CUBIC with new Reno as a fallback).
+	  selection will be made (H-TCP with new Reno as a fallback).
 
 	  If unsure, say N.

@@ -457,7 +457,7 @@ config TCP_CONG_BIC
 
 config TCP_CONG_CUBIC
 	tristate "CUBIC TCP"
-	default y
+	default m
 	---help---
 	CUBIC TCP is an sender-side only modification to the congestion control
 	algothrim improved versions on the growth function of BIC and has an

@@ -483,7 +483,7 @@ config TCP_CONG_WESTWOOD
 
 config TCP_CONG_HTCP
         tristate "H-TCP"
-        default m
+        default y
 	---help---
 	H-TCP is a send-side only modifications of the TCP Reno
 	protocol stack that optimizes the performance of TCP

@@ -586,17 +586,17 @@ config TCP_CONG_ILLINOIS
 
 choice
 	prompt "Default TCP congestion control"
-	default DEFAULT_CUBIC
+	default DEFAULT_HTCP
 	help
 	  Select the TCP congestion control that will be used by default
 	  for all connections.
 
-	config DEFAULT_CUBIC
-		bool "Cubic" if TCP_CONG_CUBIC=y
-
 	config DEFAULT_HTCP
 		bool "Htcp" if TCP_CONG_HTCP=y
 
+	config DEFAULT_CUBIC
+		bool "Cubic" if TCP_CONG_CUBIC=y
+
 	config DEFAULT_VEGAS
 		bool "Vegas" if TCP_CONG_VEGAS=y

@@ -610,7 +610,7 @@ endchoice
 
 endif
 
-config TCP_CONG_CUBIC
+config TCP_CONG_HTCP
 	tristate
 	depends on !TCP_CONG_ADVANCED
 	default y

@@ -622,7 +622,7 @@ config DEFAULT_TCP_CONG
 	default "vegas" if DEFAULT_VEGAS
 	default "westwood" if DEFAULT_WESTWOOD
 	default "reno" if DEFAULT_RENO
-	default "cubic"
+	default "htcp"
 
 config TCP_MD5SIG
 	bool "TCP: MD5 Signature Option support (RFC2385) (EXPERIMENTAL)"

arch/arm/configs/afeb9260_defconfig +1 -1

@@ -351,7 +351,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/am200epdkit_defconfig +1 -1

@@ -318,7 +318,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/ams_delta_defconfig +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/at91cap9adk_defconfig +1 -1

@@ -305,7 +305,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9260ek_defconfig +1 -1

@@ -311,7 +311,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9261ek_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9263ek_defconfig +1 -1

@@ -303,7 +303,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9g20ek_defconfig +1 -1

@@ -319,7 +319,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/cam60_defconfig +1 -1

@@ -323,7 +323,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/cm_x300_defconfig +1 -1

@@ -366,7 +366,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/colibri_defconfig +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/corgi_defconfig +1 -1

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/csb337_defconfig +1 -1

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/csb637_defconfig +1 -1

@@ -355,7 +355,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/ecbat91_defconfig +1 -1

@@ -321,7 +321,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/ep93xx_defconfig +1 -1

@@ -271,7 +271,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/eseries_pxa_defconfig +1 -1

@@ -348,7 +348,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ezx_defconfig +1 -1

@@ -340,7 +340,7 @@ CONFIG_INET_TUNNEL=m
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/arm/configs/imx27ads_defconfig +1 -1

@@ -307,7 +307,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/iop13xx_defconfig +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/iop32x_defconfig +1 -1

@@ -295,7 +295,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/iop33x_defconfig +1 -1

@@ -291,7 +291,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ixp2000_defconfig +1 -1

@@ -271,7 +271,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ixp23xx_defconfig +1 -1

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ixp4xx_defconfig +1 -1

@@ -328,7 +328,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 CONFIG_IP_VS_DEBUG=y

arch/arm/configs/jornada720_defconfig +1 -1

@@ -352,7 +352,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/kirkwood_defconfig +1 -1

@@ -312,7 +312,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/littleton_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/loki_defconfig +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/lpd270_defconfig +1 -1

@@ -259,7 +259,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/magician_defconfig +1 -1

@@ -314,7 +314,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/msm_defconfig +1 -1

@@ -275,7 +275,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/mv78xx0_defconfig +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/mx31ads_defconfig +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/mx31litekit_defconfig +1 -1

@@ -317,7 +317,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/n770_defconfig +1 -1

@@ -351,7 +351,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/omap3_beagle_defconfig +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/omap_2430sdp_defconfig +1 -1

@@ -342,7 +342,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_apollon_2420_defconfig +1 -1

@@ -334,7 +334,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_generic_1510_defconfig +1 -1

@@ -347,7 +347,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_generic_1610_defconfig +1 -1

@@ -350,7 +350,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_generic_1710_defconfig +1 -1

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_h2_1610_defconfig +1 -1

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_h4_2420_defconfig +1 -1

@@ -341,7 +341,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_innovator_1510_defconfig +1 -1

@@ -347,7 +347,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_innovator_1610_defconfig +1 -1

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_osk_5912_defconfig +1 -1

@@ -363,7 +363,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_perseus2_730_defconfig +1 -1

@@ -343,7 +343,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/onearm_defconfig +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/orion5x_defconfig +1 -1

@@ -333,7 +333,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/overo_defconfig +1 -1

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/palmtt_defconfig +1 -1

@@ -298,7 +298,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set

arch/arm/configs/palmz71_defconfig +1 -1

@@ -328,7 +328,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/palmz72_defconfig +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/pcm027_defconfig +1 -1

@@ -286,7 +286,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/pcm037_defconfig +1 -1

@@ -307,7 +307,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/pcm038_defconfig +1 -1

@@ -313,7 +313,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/picotux200_defconfig +1 -1

@@ -291,7 +291,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/arm/configs/qil-a9260_defconfig +1 -1

@@ -333,7 +333,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/realview-smp_defconfig +1 -1

@@ -262,7 +262,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set

arch/arm/configs/rpc_defconfig +1 -1

@@ -273,7 +273,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/s3c2410_defconfig +1 -1

@@ -390,7 +390,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/arm/configs/sam9_l9260_defconfig +1 -1

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/spitz_defconfig +1 -1

@@ -363,7 +363,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/sx1_defconfig +1 -1

@@ -336,7 +336,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/trizeps4_defconfig +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #

arch/arm/configs/usb-a9260_defconfig +1 -1

@@ -333,7 +333,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/usb-a9263_defconfig +1 -1

@@ -325,7 +325,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/viper_defconfig +1 -1

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/xm_x2xx_defconfig +1 -1

@@ -379,7 +379,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/yl9200_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set

arch/arm/configs/zylonite_defconfig +1 -1

@@ -292,7 +292,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/avr32/configs/atngw100_defconfig +1 -1

@@ -269,7 +269,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/avr32/configs/atngw100_evklcd100_defconfig +1 -1

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/avr32/configs/atngw100_evklcd101_defconfig +1 -1

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/avr32/configs/atstk1002_defconfig +1 -1

@@ -270,7 +270,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/avr32/configs/atstk1003_defconfig +1 -1

@@ -261,7 +261,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/avr32/configs/atstk1004_defconfig +1 -1

@@ -205,7 +205,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/avr32/configs/atstk1006_defconfig +1 -1

@@ -270,7 +270,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/avr32/configs/favr-32_defconfig +1 -1

@@ -263,7 +263,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/avr32/configs/mimc200_defconfig +1 -1

@@ -263,7 +263,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/blackfin/configs/BF526-EZBRD_defconfig +1 -1

@@ -421,7 +421,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETLABEL is not set

arch/blackfin/configs/BF527-EZKIT_defconfig +1 -1

@@ -400,7 +400,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF533-EZKIT_defconfig +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF533-STAMP_defconfig +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF537-STAMP_defconfig +1 -1

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF548-EZKIT_defconfig +1 -1

@@ -439,7 +439,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF561-EZKIT_defconfig +1 -1

@@ -410,7 +410,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BlackStamp_defconfig +1 -1

@@ -396,7 +396,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETLABEL is not set

arch/blackfin/configs/CM-BF527_defconfig +1 -1

@@ -403,7 +403,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF533_defconfig +1 -1

@@ -361,7 +361,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF537E_defconfig +1 -1

@@ -372,7 +372,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF537U_defconfig +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF548_defconfig +1 -1

@@ -437,7 +437,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF561_defconfig +1 -1

@@ -404,7 +404,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/H8606_defconfig +1 -1

@@ -361,7 +361,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/IP0X_defconfig +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/blackfin/configs/PNAV-10_defconfig +1 -1

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/SRV1_defconfig +1 -1

@@ -387,7 +387,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/cris/configs/artpec_3_defconfig +1 -1

@@ -205,7 +205,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/cris/configs/etrax-100lx_v2_defconfig +1 -1

@@ -204,7 +204,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/cris/configs/etraxfs_defconfig +1 -1

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/ia64/configs/generic_defconfig +1 -1

@@ -323,7 +323,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/ia64/configs/tiger_defconfig +1 -1

@@ -264,7 +264,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/ia64/configs/zx1_defconfig +1 -1

@@ -261,7 +261,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #

arch/m32r/configs/m32104ut_defconfig +1 -1

@@ -191,7 +191,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/m32r/configs/m32700ut.smp_defconfig +1 -1

@@ -203,7 +203,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/m32700ut.up_defconfig +1 -1

@@ -200,7 +200,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi.nommu_defconfig +1 -1

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi.smp_defconfig +1 -1

@@ -212,7 +212,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi.up_defconfig +1 -1

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi2.opsp_defconfig +1 -1

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi2.vdec2_defconfig +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi3.smp_defconfig +1 -1

@@ -212,7 +212,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/oaks32r_defconfig +1 -1

@@ -193,7 +193,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/opsput_defconfig +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/usrv_defconfig +1 -1

@@ -215,7 +215,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m68k/configs/amiga_defconfig +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/apollo_defconfig +1 -1

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/atari_defconfig +1 -1

@@ -206,7 +206,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/bvme6000_defconfig +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/hp300_defconfig +1 -1

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/mac_defconfig +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/multi_defconfig +1 -1

@@ -220,7 +220,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/mvme147_defconfig +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/mvme16x_defconfig +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/q40_defconfig +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/sun3_defconfig +1 -1

@@ -196,7 +196,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/sun3x_defconfig +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68knommu/configs/m5208evb_defconfig +1 -1

@@ -213,7 +213,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/configs/m5275evb_defconfig +1 -1

@@ -216,7 +216,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/configs/m5307c3_defconfig +1 -1

@@ -222,7 +222,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/configs/m5407c3_defconfig +1 -1

@@ -218,7 +218,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/defconfig +1 -1

@@ -220,7 +220,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/bcm47xx_defconfig +4 ~~-20~~

@@ -320,26 +320,10 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_BIC=y
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/bigsur_defconfig +1 -1

@@ -353,7 +353,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/capcella_defconfig +1 -1

@@ -276,7 +276,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/cobalt_defconfig +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/mips/configs/db1000_defconfig +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1100_defconfig +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1200_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1500_defconfig +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1550_defconfig +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/decstation_defconfig +1 -1

@@ -293,7 +293,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/mips/configs/emma2rh_defconfig +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/excite_defconfig +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/fulong_defconfig +1 -1

@@ -297,7 +297,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/mips/configs/ip22_defconfig +1 -1

@@ -286,7 +286,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/ip27_defconfig +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/ip28_defconfig +1 -1

@@ -327,7 +327,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/ip32_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/jazz_defconfig +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/jmr3927_defconfig +1 -1

@@ -281,7 +281,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set

arch/mips/configs/lasat_defconfig +1 -1

@@ -262,7 +262,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/malta_defconfig +1 -1

@@ -327,7 +327,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/mipssim_defconfig +1 -1

@@ -287,7 +287,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/mpc30x_defconfig +1 -1

@@ -273,7 +273,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/msp71xx_defconfig +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #

arch/mips/configs/mtx1_defconfig +1 -1

@@ -321,7 +321,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/pb1100_defconfig +1 -1

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/pb1500_defconfig +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/pb1550_defconfig +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/pnx8550-jbs_defconfig +1 -1

@@ -297,7 +297,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/pnx8550-stb810_defconfig +1 -1

@@ -295,7 +295,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/rb532_defconfig +4 ~~-20~~

@@ -306,26 +306,10 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=y
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="vegas"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/mips/configs/rbtx49xx_defconfig +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set

arch/mips/configs/rm200_defconfig +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/sb1250-swarm_defconfig +1 -1

@@ -352,7 +352,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/tb0219_defconfig +1 -1

@@ -311,7 +311,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/tb0226_defconfig +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/tb0287_defconfig +4 ~~-20~~

@@ -308,26 +308,10 @@ CONFIG_INET_TUNNEL=m
 # CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-CONFIG_DEFAULT_BIC=y
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/workpad_defconfig +1 -1

@@ -282,7 +282,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/wrppmc_defconfig +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/yosemite_defconfig +1 -1

@@ -297,7 +297,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y

arch/mn10300/configs/asb2303_defconfig +1 -1

@@ -191,7 +191,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/parisc/configs/712_defconfig +1 -1

@@ -201,7 +201,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/parisc/configs/a500_defconfig +1 -1

@@ -232,7 +232,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/parisc/configs/b180_defconfig +1 -1

@@ -192,7 +192,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set

arch/parisc/configs/c3000_defconfig +1 -1

@@ -202,7 +202,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/parisc/configs/default_defconfig +1 -1

@@ -228,7 +228,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/40x/acadia_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/ep405_defconfig +1 -1

@@ -301,7 +301,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/hcu4_defconfig +1 -1

@@ -294,7 +294,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/kilauea_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/makalu_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/walnut_defconfig +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/arches_defconfig +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/bamboo_defconfig +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/canyonlands_defconfig +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/ebony_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/katmai_defconfig +1 -1

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/rainier_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/sam440ep_defconfig +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/sequoia_defconfig +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/taishan_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/virtex5_defconfig +1 -1

@@ -315,7 +315,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/powerpc/configs/44x/warp_defconfig +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/52xx/cm5200_defconfig +1 -1

@@ -298,7 +298,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/lite5200b_defconfig +1 -1

@@ -313,7 +313,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/motionpro_defconfig +1 -1

@@ -298,7 +298,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/pcm030_defconfig +1 -1

@@ -303,7 +303,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/tqm5200_defconfig +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/asp8347_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc832x_mds_defconfig +1 -1

@@ -331,7 +331,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +1 -1

@@ -331,7 +331,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc834x_itx_defconfig +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc834x_mds_defconfig +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc836x_mds_defconfig +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +1 -1

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc837x_mds_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +1 -1

@@ -325,7 +325,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/sbc834x_defconfig +1 -1

@@ -328,7 +328,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/ksi8560_defconfig +1 -1

@@ -301,7 +301,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8536_ds_defconfig +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/85xx/mpc8540_ads_defconfig +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8544_ds_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/85xx/mpc8560_ads_defconfig +1 -1

@@ -312,7 +312,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8568mds_defconfig +1 -1

@@ -315,7 +315,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8572_ds_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/sbc8548_defconfig +1 -1

@@ -307,7 +307,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/sbc8560_defconfig +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/stx_gp3_defconfig +1 -1

@@ -317,7 +317,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/85xx/tqm8540_defconfig +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/tqm8541_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/tqm8548_defconfig +1 -1

@@ -320,7 +320,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/tqm8555_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/tqm8560_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/86xx/gef_sbc610_defconfig +1 -1

@@ -323,7 +323,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig +1 -1

@@ -325,7 +325,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig +1 -1

@@ -337,7 +337,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/86xx/sbc8641d_defconfig +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/powerpc/configs/adder875_defconfig +1 -1

@@ -300,7 +300,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/c2k_defconfig +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/powerpc/configs/cell_defconfig +1 -1

@@ -370,7 +370,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/powerpc/configs/celleb_defconfig +1 -1

@@ -320,7 +320,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/powerpc/configs/chrp32_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/ep8248e_defconfig +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/ep88xc_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/g5_defconfig +1 -1

@@ -334,7 +334,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/holly_defconfig +1 -1

@@ -283,7 +283,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/powerpc/configs/iseries_defconfig +1 -1

@@ -317,7 +317,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/linkstation_defconfig +1 -1

@@ -322,7 +322,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/maple_defconfig +1 -1

@@ -313,7 +313,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/mgcoge_defconfig +1 -1

@@ -275,7 +275,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/mgsuvd_defconfig +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/mpc5200_defconfig +1 -1

@@ -294,7 +294,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/powerpc/configs/mpc7448_hpc2_defconfig +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/mpc8272_ads_defconfig +1 -1

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/mpc83xx_defconfig +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/mpc85xx_defconfig +1 -1

@@ -334,7 +334,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/mpc866_ads_defconfig +1 -1

@@ -301,7 +301,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/mpc86xx_defconfig +1 -1

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/mpc885_ads_defconfig +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/pasemi_defconfig +1 -1

@@ -349,7 +349,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/pmac32_defconfig +1 -1

@@ -360,7 +360,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/ppc40x_defconfig +1 -1

@@ -311,7 +311,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/ppc44x_defconfig +1 -1

@@ -323,7 +323,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/ppc64_defconfig +1 -1

@@ -424,7 +424,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/ppc6xx_defconfig +4 ~~-20~~

@@ -445,26 +445,10 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/powerpc/configs/pq2fads_defconfig +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/prpmc2800_defconfig +1 -1

@@ -313,7 +313,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/ps3_defconfig +1 -1

@@ -333,7 +333,7 @@ CONFIG_INET_TUNNEL=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/pseries_defconfig +1 -1

@@ -349,7 +349,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/storcenter_defconfig +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/s390/defconfig +1 -1

@@ -280,7 +280,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/sh/configs/ap325rxa_defconfig +1 -1

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/cayman_defconfig +1 -1

@@ -324,7 +324,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/dreamcast_defconfig +1 -1

@@ -358,7 +358,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/edosk7760_defconfig +1 -1

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/landisk_defconfig +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/lboxre2_defconfig +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/magicpanelr2_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/microdev_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/migor_defconfig +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/r7780mp_defconfig +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/r7785rp_defconfig +1 -1

@@ -383,7 +383,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/rsk7203_defconfig +1 -1

@@ -328,7 +328,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/rts7751r2d1_defconfig +1 -1

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/rts7751r2dplus_defconfig +1 -1

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/sdk7780_defconfig +1 -1

@@ -379,7 +379,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/sh/configs/se7206_defconfig +1 -1

@@ -351,7 +351,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7343_defconfig +1 -1

@@ -325,7 +325,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7705_defconfig +1 -1

@@ -324,7 +324,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7712_defconfig +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7721_defconfig +1 -1

@@ -342,7 +342,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7722_defconfig +1 -1

@@ -350,7 +350,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7750_defconfig +1 -1

@@ -331,7 +331,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7751_defconfig +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/se7780_defconfig +1 -1

@@ -325,7 +325,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set

arch/sh/configs/sh03_defconfig +1 -1

@@ -348,7 +348,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/sh7710voipgw_defconfig +1 -1

@@ -322,7 +322,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/sh7763rdp_defconfig +1 -1

@@ -336,7 +336,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/sh7785lcr_defconfig +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/shmin_defconfig +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/shx3_defconfig +1 -1

@@ -385,7 +385,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/sh/configs/snapgear_defconfig +1 -1

@@ -321,7 +321,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/sh/configs/titan_defconfig +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y

arch/sparc/defconfig +1 -1

@@ -193,7 +193,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/sparc64/defconfig +1 -1

@@ -252,7 +252,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/um/defconfig +1 -1

@@ -277,7 +277,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/x86/configs/i386_defconfig +4 ~~-20~~

@@ -498,26 +498,10 @@ CONFIG_INET_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_LRO=y
 # CONFIG_INET_DIAG is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TCP_CONG_WESTWOOD is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_DEFAULT_BIC is not set
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/x86/configs/x86_64_defconfig +4 ~~-19~~

@@ -488,26 +488,11 @@ CONFIG_INET_TUNNEL=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_LRO=y
 # CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TCP_CONG_WESTWOOD is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_DEFAULT_BIC is not set
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

Sangtae Ha

2008-10-31 19:43 UTC #13 lore raw

Re: [RFC] tcp: make H-TCP the default congestion control

Hi Stephen,

CUBIC has been used for a while and has been tested than any other protocols, so it might be better to leave it on?
We can do it disable hystart parameter default to 0 to the patch that Injong and I submitted.
In that way, people who are interested in Hystart can turn on this feature optionally and report the problem to us. Later our testing over MacOSX has been done, we can turn on that flag safely. As HyStart is not only specific improvment for CUBIC but it can help all protocols, it makes no sense to change the default congestion control algorithm abruptely.

I attached the patch that disables HyStart from the default, so that no changes have been made to CUBIC v2.2.

Thanks,
Sangtae

Quoted 2,597 lines · Stephen Hemminger

For researchers with very high speed networks
with switches with minuscule queues, CUBIC works better. H-TCP sees the packet loss from the small queue and reduces sending rate.

Signed-off-by Stephen Hemminger <[email protected]>

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +9 -9

@@ -429,7 +429,7 @@ menuconfig TCP_CONG_ADVANCED
         modules.
 
         Nearly all users can safely say no here, and a safe default
-         selection will be made (CUBIC with new Reno as a fallback).
+         selection will be made (H-TCP with new Reno as a fallback).
 
         If unsure, say N.

@@ -457,7 +457,7 @@ config TCP_CONG_BIC
 
 config TCP_CONG_CUBIC
       tristate "CUBIC TCP"
-       default y
+       default m
       ---help---
       CUBIC TCP is an sender-side only modification to the congestion control
       algothrim improved versions on the growth function of BIC and has an

@@ -483,7 +483,7 @@ config TCP_CONG_WESTWOOD
 
 config TCP_CONG_HTCP
        tristate "H-TCP"
-        default m
+        default y
       ---help---
       H-TCP is a send-side only modifications of the TCP Reno
       protocol stack that optimizes the performance of TCP

@@ -586,17 +586,17 @@ config TCP_CONG_ILLINOIS
 
 choice
       prompt "Default TCP congestion control"
-       default DEFAULT_CUBIC
+       default DEFAULT_HTCP
       help
         Select the TCP congestion control that will be used by default
         for all connections.
 
-       config DEFAULT_CUBIC
-               bool "Cubic" if TCP_CONG_CUBIC=y
-
       config DEFAULT_HTCP
               bool "Htcp" if TCP_CONG_HTCP=y
 
+       config DEFAULT_CUBIC
+               bool "Cubic" if TCP_CONG_CUBIC=y
+
       config DEFAULT_VEGAS
               bool "Vegas" if TCP_CONG_VEGAS=y

@@ -610,7 +610,7 @@ endchoice
 
 endif
 
-config TCP_CONG_CUBIC
+config TCP_CONG_HTCP
       tristate
       depends on !TCP_CONG_ADVANCED
       default y

@@ -622,7 +622,7 @@ config DEFAULT_TCP_CONG
       default "vegas" if DEFAULT_VEGAS
       default "westwood" if DEFAULT_WESTWOOD
       default "reno" if DEFAULT_RENO
-       default "cubic"
+       default "htcp"
 
 config TCP_MD5SIG
       bool "TCP: MD5 Signature Option support (RFC2385) (EXPERIMENTAL)"

arch/arm/configs/afeb9260_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -351,7 +351,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/am200epdkit_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -318,7 +318,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/ams_delta_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/at91cap9adk_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -305,7 +305,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9260ek_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -311,7 +311,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9261ek_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9263ek_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -303,7 +303,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/at91sam9g20ek_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -319,7 +319,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/cam60_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -323,7 +323,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/cm_x300_defconfig 2008-10-30 08:21:23.000000000 -0700 +1 -1

@@ -366,7 +366,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/colibri_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/corgi_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/csb337_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/csb637_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -355,7 +355,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/ecbat91_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -321,7 +321,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/ep93xx_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -271,7 +271,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/eseries_pxa_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -348,7 +348,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ezx_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -340,7 +340,7 @@ CONFIG_INET_TUNNEL=m
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/arm/configs/imx27ads_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -307,7 +307,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/iop13xx_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/iop32x_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -295,7 +295,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/iop33x_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -291,7 +291,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ixp2000_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -271,7 +271,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ixp23xx_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/ixp4xx_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -328,7 +328,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 CONFIG_IP_VS_DEBUG=y

arch/arm/configs/jornada720_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -352,7 +352,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/kirkwood_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -312,7 +312,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/littleton_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/loki_defconfig 2008-10-30 08:21:24.000000000 -0700 +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/lpd270_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -259,7 +259,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/magician_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -314,7 +314,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/msm_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -275,7 +275,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/mv78xx0_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/mx31ads_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/mx31litekit_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -317,7 +317,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/n770_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -351,7 +351,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/arm/configs/omap3_beagle_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/omap_2430sdp_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -342,7 +342,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_apollon_2420_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -334,7 +334,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_generic_1510_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -347,7 +347,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_generic_1610_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -350,7 +350,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_generic_1710_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_h2_1610_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_h4_2420_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -341,7 +341,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_innovator_1510_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -347,7 +347,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_innovator_1610_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_osk_5912_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -363,7 +363,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/omap_perseus2_730_defconfig 2008-10-30 08:21:26.000000000 -0700 renamed from arch/arm/configs/omap_perseus2_730_defconfig 2008-10-30 08:21:25.000000000 -0700 +1 -1

@@ -343,7 +343,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/onearm_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/orion5x_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -333,7 +333,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/overo_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/palmtt_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -298,7 +298,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set

arch/arm/configs/palmz71_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -328,7 +328,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/palmz72_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/pcm027_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -286,7 +286,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/pcm037_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -307,7 +307,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/pcm038_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -313,7 +313,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/picotux200_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -291,7 +291,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/arm/configs/qil-a9260_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -333,7 +333,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/realview-smp_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -262,7 +262,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set

arch/arm/configs/rpc_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -273,7 +273,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/s3c2410_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -390,7 +390,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/arm/configs/sam9_l9260_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/spitz_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -363,7 +363,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/arm/configs/sx1_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -336,7 +336,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/trizeps4_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #

arch/arm/configs/usb-a9260_defconfig 2008-10-30 08:21:26.000000000 -0700 +1 -1

@@ -333,7 +333,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/usb-a9263_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -325,7 +325,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/arm/configs/viper_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/xm_x2xx_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -379,7 +379,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/arm/configs/yl9200_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -299,7 +299,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set

arch/arm/configs/zylonite_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -292,7 +292,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/avr32/configs/atngw100_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -269,7 +269,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/avr32/configs/atngw100_evklcd100_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/avr32/configs/atngw100_evklcd101_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y

arch/avr32/configs/atstk1002_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -270,7 +270,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/avr32/configs/atstk1003_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -261,7 +261,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/avr32/configs/atstk1004_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -205,7 +205,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/avr32/configs/atstk1006_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -270,7 +270,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set

arch/avr32/configs/favr-32_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -263,7 +263,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/avr32/configs/mimc200_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -263,7 +263,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/blackfin/configs/BF526-EZBRD_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -421,7 +421,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETLABEL is not set

arch/blackfin/configs/BF527-EZKIT_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -400,7 +400,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF533-EZKIT_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF533-STAMP_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF537-STAMP_defconfig 2008-10-30 08:21:27.000000000 -0700 +1 -1

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF548-EZKIT_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -439,7 +439,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BF561-EZKIT_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -410,7 +410,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/BlackStamp_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -396,7 +396,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETLABEL is not set

arch/blackfin/configs/CM-BF527_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -403,7 +403,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF533_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -361,7 +361,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF537E_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -372,7 +372,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF537U_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF548_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -437,7 +437,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/CM-BF561_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -404,7 +404,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/H8606_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -361,7 +361,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/IP0X_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/blackfin/configs/PNAV-10_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/blackfin/configs/SRV1_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -387,7 +387,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/cris/configs/artpec_3_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -205,7 +205,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/cris/configs/etrax-100lx_v2_defconfig 2008-10-30 08:21:28.000000000 -0700 +1 -1

@@ -204,7 +204,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/cris/configs/etraxfs_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/ia64/configs/generic_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -323,7 +323,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/ia64/configs/tiger_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -264,7 +264,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/ia64/configs/zx1_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -261,7 +261,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #

arch/m32r/configs/m32104ut_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -191,7 +191,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/m32r/configs/m32700ut.smp_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -203,7 +203,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/m32700ut.up_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -200,7 +200,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi.nommu_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi.smp_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -212,7 +212,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi.up_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi2.opsp_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi2.vdec2_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/mappi3.smp_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -212,7 +212,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/oaks32r_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -193,7 +193,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/opsput_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m32r/configs/usrv_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -215,7 +215,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/m68k/configs/amiga_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/apollo_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/atari_defconfig 2008-10-30 08:21:29.000000000 -0700 +1 -1

@@ -206,7 +206,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/bvme6000_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/hp300_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/mac_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/multi_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -220,7 +220,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/mvme147_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/mvme16x_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/q40_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/sun3_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -196,7 +196,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68k/configs/sun3x_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/m68knommu/configs/m5208evb_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -213,7 +213,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/configs/m5275evb_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -216,7 +216,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/configs/m5307c3_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -222,7 +222,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/configs/m5407c3_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -218,7 +218,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -220,7 +220,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/bcm47xx_defconfig 2008-10-30 08:26:00.000000000 -0700 renamed from arch/mips/configs/bcm47xx_defconfig 2008-10-30 08:21:30.000000000 -0700 +4 ~~-20~~

@@ -320,26 +320,10 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_BIC=y
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/bigsur_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -353,7 +353,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/capcella_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -276,7 +276,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/cobalt_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/mips/configs/db1000_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1100_defconfig 2008-10-30 08:21:31.000000000 -0700 renamed from arch/mips/configs/db1100_defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -1

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1200_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1500_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/db1550_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/decstation_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -293,7 +293,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y

arch/mips/configs/emma2rh_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/excite_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/fulong_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -297,7 +297,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/mips/configs/ip22_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -286,7 +286,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/ip27_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/ip28_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -327,7 +327,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/ip32_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/jazz_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/jmr3927_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -281,7 +281,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set

arch/mips/configs/lasat_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -262,7 +262,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/malta_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -327,7 +327,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/mipssim_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -287,7 +287,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/mpc30x_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -273,7 +273,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/msp71xx_defconfig 2008-10-30 08:21:31.000000000 -0700 +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #

arch/mips/configs/mtx1_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -321,7 +321,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set

arch/mips/configs/pb1100_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/pb1500_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/pb1550_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/pnx8550-jbs_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -297,7 +297,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/pnx8550-stb810_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -295,7 +295,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/rb532_defconfig 2008-10-30 08:26:46.000000000 -0700 renamed from arch/mips/configs/rb532_defconfig 2008-10-30 08:21:32.000000000 -0700 +4 ~~-20~~

@@ -306,26 +306,10 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=y
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="vegas"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/mips/configs/rbtx49xx_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set

arch/mips/configs/rm200_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #

arch/mips/configs/sb1250-swarm_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -352,7 +352,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/tb0219_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -311,7 +311,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/tb0226_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/tb0287_defconfig 2008-10-30 08:27:08.000000000 -0700 renamed from arch/mips/configs/tb0287_defconfig 2008-10-30 08:21:32.000000000 -0700 +4 ~~-20~~

@@ -308,26 +308,10 @@ CONFIG_INET_TUNNEL=m
 # CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-CONFIG_DEFAULT_BIC=y
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y

arch/mips/configs/workpad_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -282,7 +282,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/wrppmc_defconfig 2008-10-30 08:21:32.000000000 -0700 +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/mips/configs/yosemite_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -297,7 +297,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y

arch/mn10300/configs/asb2303_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -191,7 +191,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set

arch/parisc/configs/712_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -201,7 +201,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/parisc/configs/a500_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -232,7 +232,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/parisc/configs/b180_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -192,7 +192,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set

arch/parisc/configs/c3000_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -202,7 +202,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/parisc/configs/default_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -228,7 +228,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/40x/acadia_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/ep405_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -301,7 +301,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/hcu4_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -294,7 +294,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/kilauea_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/makalu_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/40x/walnut_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/arches_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/bamboo_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/canyonlands_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/ebony_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/katmai_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/rainier_defconfig 2008-10-30 08:21:34.000000000 -0700 renamed from arch/powerpc/configs/44x/rainier_defconfig 2008-10-30 08:21:33.000000000 -0700 +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/sam440ep_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/sequoia_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/taishan_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/44x/virtex5_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -315,7 +315,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m

arch/powerpc/configs/44x/warp_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set

arch/powerpc/configs/52xx/cm5200_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -298,7 +298,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/lite5200b_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -313,7 +313,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/motionpro_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -298,7 +298,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/pcm030_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -303,7 +303,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/52xx/tqm5200_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/asp8347_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc8315_rdb_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc832x_mds_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -331,7 +331,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc832x_rdb_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -331,7 +331,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc834x_itx_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc834x_mds_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc836x_mds_defconfig 2008-10-30 08:21:34.000000000 -0700 +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc836x_rdk_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc837x_mds_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/mpc837x_rdb_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -325,7 +325,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/83xx/sbc834x_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -328,7 +328,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/ksi8560_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -301,7 +301,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8536_ds_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/85xx/mpc8540_ads_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8544_ds_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc/configs/85xx/mpc8560_ads_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -312,7 +312,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8568mds_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -315,7 +315,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/powerpc/configs/85xx/mpc8572_ds_defconfig 2008-10-30 08:21:35.000000000 -0700 +1 -1

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set

arch/powerpc... renamed from arch/powerpc/configs/85xx/mpc85xx_cds_defconfig 2008-10-30 08:21:35.000000000 -0700 +0 -0

Quoted 1 line

[Message clipped]

From 973855cd9070af7366fd7be521e56bdc9ce10dab Mon Sep 17 00:00:00 2001
From: Sangtae Ha <[email protected]>
Date: Fri, 31 Oct 2008 15:03:10 -0400
Subject: [PATCH] [RFC] [TCP] Set Hystart of CUBIC parameter to 0

As HyStart needs more testing over other platforms such as MacOSX, we postpone this option to the default. When everything has been worked out, we can safely turn it on again.

Signed-off-by Sangtae Ha <[email protected]>

---
 net/ipv4/tcp_cubic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

net/ipv4/tcp_cubic.c +1 -1

index ee467ec..47bbbfc 100644
@@ -49,7 +49,7 @@ static int initial_ssthresh __read_mostly;
 static int bic_scale __read_mostly = 41;
 static int tcp_friendliness __read_mostly = 1;
 
-static int hystart __read_mostly = 1;
+static int hystart __read_mostly;
 static int hystart_detect __read_mostly = HYSTART_ACK_TRAIN | HYSTART_DELAY;
 static int hystart_low_window __read_mostly = 16;

Signature · 1 line

1.5.2.2

[email protected]

2008-10-31 20:13 UTC #14 lore raw

Re: [RFC] tcp: make H-TCP the default congestion control

Note that HyStart is a slow start algorithm, but congestion control. So it is an independent protocol from tcp congestion control.
It can be used with any protocols. You may turn it off and cubic will work as it was.

If the decision of switching is because of this new addition, that may not be a good motivation because that is
switching to a new congestion control algorithm. For that, you just need to switch off the new slow start until it is verified.

Injong

Quoted 3,068 lines

Hi Stephen,

I attached the patch that disables HyStart from the default, so that no changes have been made to CUBIC v2.2.

Thanks,
Sangtae

Quoted 3,044 lines · Stephen Hemminger

This is likely to generate interesting discussion and testing. Both H-TCP and CUBIC are robust. For most users, there will be no perceivable difference, but for users with excessively large queues (DSL ISPs)
H-TCP is more fair. One CUBIC flow fills the queue, and the second flow never pushes hard enough to cause fairness.

For researchers with very high speed networks
with switches with minuscule queues, CUBIC works better. H-TCP sees the packet loss from the small queue and reduces sending rate.

Signed-off-by Stephen Hemminger <[email protected]>

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +2 -2

@@ -429,7 +429,7 @@ menuconfig TCP_CONG_ADVANCED
         modules.
 
         Nearly all users can safely say no here, and a safe default
-         selection will be made (CUBIC with new Reno as a fallback).
+         selection will be made (H-TCP with new Reno as a fallback).
 
         If unsure, say N.

@@ -457,7 +457,7 @@ config TCP_CONG_BIC
 
 config TCP_CONG_CUBIC
       tristate "CUBIC TCP"
-       default y
+       default m
       ---help---
       CUBIC TCP is an sender-side only modification to the congestion

control
algothrim improved versions on the growth function of BIC and has
an

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +7 -8

@@ -483,7 +483,7 @@ config TCP_CONG_WESTWOOD
 
 config TCP_CONG_HTCP
        tristate "H-TCP"
-        default m
+        default y
       ---help---
       H-TCP is a send-side only modifications of the TCP Reno
       protocol stack that optimizes the performance of TCP

@@ -586,17 +586,17 @@ config TCP_CONG_ILLINOIS
 
 choice
       prompt "Default TCP congestion control"
-       default DEFAULT_CUBIC
+       default DEFAULT_HTCP
       help
         Select the TCP congestion control that will be used by default
         for all connections.
 
-       config DEFAULT_CUBIC
-               bool "Cubic" if TCP_CONG_CUBIC=y
-
       config DEFAULT_HTCP
               bool "Htcp" if TCP_CONG_HTCP=y
 
+       config DEFAULT_CUBIC
+               bool "Cubic" if TCP_CONG_CUBIC=y
+
       config DEFAULT_VEGAS
               bool "Vegas" if TCP_CONG_VEGAS=y

@@ -610,7 +610,7 @@ endchoice
 
 endif
 
-config TCP_CONG_CUBIC
+config TCP_CONG_HTCP
       tristate
       depends on !TCP_CONG_ADVANCED
       default y

@@ -622,7 +622,7 @@ config DEFAULT_TCP_CONG
       default "vegas" if DEFAULT_VEGAS
       default "westwood" if DEFAULT_WESTWOOD
       default "reno" if DEFAULT_RENO
-       default "cubic"
+       default "htcp"
 
 config TCP_MD5SIG
       bool "TCP: MD5 Signature Option support (RFC2385) (EXPERIMENTAL)"
--- a/arch/arm/configs/afeb9260_defconfig       2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/afeb9260_defconfig 2008-10-30
08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -351,7 +351,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/am200epdkit_defconfig    2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/am200epdkit_defconfig 2008-10-30
08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -318,7 +318,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/ams_delta_defconfig      2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/ams_delta_defconfig 2008-10-30
08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/at91cap9adk_defconfig    2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/at91cap9adk_defconfig 2008-10-30
08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -305,7 +305,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/at91sam9260ek_defconfig  2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/at91sam9260ek_defconfig 2008-10-30 08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -311,7 +311,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/at91sam9261ek_defconfig  2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/at91sam9261ek_defconfig 2008-10-30 08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/at91sam9263ek_defconfig  2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/at91sam9263ek_defconfig 2008-10-30 08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -303,7 +303,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/at91sam9g20ek_defconfig  2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/at91sam9g20ek_defconfig 2008-10-30 08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -319,7 +319,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/cam60_defconfig  2008-10-30 08:21:23.000000000
-0700
+++ b/arch/arm/configs/cam60_defconfig  2008-10-30 08:21:23.000000000
-0700

@@ -323,7 +323,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/cm_x300_defconfig        2008-10-30

08:21:23.000000000 -0700
+++ b/arch/arm/configs/cm_x300_defconfig 2008-10-30
08:21:23.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -366,7 +366,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/colibri_defconfig        2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/colibri_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +7 ~~-14~~

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/arm/configs/corgi_defconfig  2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/corgi_defconfig  2008-10-30 08:21:24.000000000
-0700

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/csb337_defconfig 2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/csb337_defconfig 2008-10-30 08:21:24.000000000
-0700

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/csb637_defconfig 2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/csb637_defconfig 2008-10-30 08:21:24.000000000
-0700

@@ -355,7 +355,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/ecbat91_defconfig        2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/ecbat91_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -321,7 +321,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/ep93xx_defconfig 2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/ep93xx_defconfig 2008-10-30 08:21:24.000000000
-0700

@@ -271,7 +271,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/eseries_pxa_defconfig    2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/eseries_pxa_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -348,7 +348,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/ezx_defconfig    2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/ezx_defconfig    2008-10-30 08:21:24.000000000
-0700

@@ -340,7 +340,7 @@ CONFIG_INET_TUNNEL=m
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/arm/configs/imx27ads_defconfig       2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/imx27ads_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -307,7 +307,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/iop13xx_defconfig        2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/iop13xx_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +5 ~~-10~~

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/iop32x_defconfig 2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/iop32x_defconfig 2008-10-30 08:21:24.000000000
-0700

@@ -295,7 +295,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/iop33x_defconfig 2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/iop33x_defconfig 2008-10-30 08:21:24.000000000
-0700

@@ -291,7 +291,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/ixp2000_defconfig        2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/ixp2000_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -271,7 +271,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/ixp23xx_defconfig        2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/ixp23xx_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/ixp4xx_defconfig 2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/ixp4xx_defconfig 2008-10-30 08:21:24.000000000
-0700

@@ -328,7 +328,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 CONFIG_IP_VS_DEBUG=y
--- a/arch/arm/configs/jornada720_defconfig     2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/jornada720_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -352,7 +352,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/arm/configs/kirkwood_defconfig       2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/kirkwood_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -312,7 +312,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/littleton_defconfig      2008-10-30

08:21:24.000000000 -0700
+++ b/arch/arm/configs/littleton_defconfig 2008-10-30
08:21:24.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +5 ~~-10~~

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/loki_defconfig   2008-10-30 08:21:24.000000000
-0700
+++ b/arch/arm/configs/loki_defconfig   2008-10-30 08:21:24.000000000
-0700

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/lpd270_defconfig 2008-10-30 08:21:25.000000000
-0700
+++ b/arch/arm/configs/lpd270_defconfig 2008-10-30 08:21:25.000000000
-0700

@@ -259,7 +259,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/magician_defconfig       2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/magician_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -314,7 +314,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/arm/configs/msm_defconfig    2008-10-30 08:21:25.000000000
-0700
+++ b/arch/arm/configs/msm_defconfig    2008-10-30 08:21:25.000000000
-0700

@@ -275,7 +275,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/mv78xx0_defconfig        2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/mv78xx0_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/mx31ads_defconfig        2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/mx31ads_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/mx31litekit_defconfig    2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/mx31litekit_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -317,7 +317,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/n770_defconfig   2008-10-30 08:21:25.000000000
-0700
+++ b/arch/arm/configs/n770_defconfig   2008-10-30 08:21:25.000000000
-0700

@@ -351,7 +351,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/arm/configs/omap3_beagle_defconfig   2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap3_beagle_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -359,7 +359,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/omap_2430sdp_defconfig   2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_2430sdp_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -342,7 +342,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_apollon_2420_defconfig      2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_apollon_2420_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -334,7 +334,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_generic_1510_defconfig      2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_generic_1510_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -347,7 +347,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_generic_1610_defconfig      2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_generic_1610_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -350,7 +350,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_generic_1710_defconfig      2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_generic_1710_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_h2_1610_defconfig   2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_h2_1610_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_h4_2420_defconfig   2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_h4_2420_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -341,7 +341,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_innovator_1510_defconfig    2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_innovator_1510_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -347,7 +347,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_innovator_1610_defconfig    2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_innovator_1610_defconfig 2008-10-30
08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -344,7 +344,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_osk_5912_defconfig  2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_osk_5912_defconfig 2008-10-30 08:21:25.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -363,7 +363,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/omap_perseus2_730_defconfig      2008-10-30

08:21:25.000000000 -0700
+++ b/arch/arm/configs/omap_perseus2_730_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -343,7 +343,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/onearm_defconfig 2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/onearm_defconfig 2008-10-30 08:21:26.000000000
-0700

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/orion5x_defconfig        2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/orion5x_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +5 ~~-10~~

@@ -333,7 +333,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/overo_defconfig  2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/overo_defconfig  2008-10-30 08:21:26.000000000
-0700

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/palmtt_defconfig 2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/palmtt_defconfig 2008-10-30 08:21:26.000000000
-0700

@@ -298,7 +298,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
--- a/arch/arm/configs/palmz71_defconfig        2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/palmz71_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -328,7 +328,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/palmz72_defconfig        2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/palmz72_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +7 ~~-14~~

@@ -339,7 +339,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/pcm027_defconfig 2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/pcm027_defconfig 2008-10-30 08:21:26.000000000
-0700

@@ -286,7 +286,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/pcm037_defconfig 2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/pcm037_defconfig 2008-10-30 08:21:26.000000000
-0700

@@ -307,7 +307,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/pcm038_defconfig 2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/pcm038_defconfig 2008-10-30 08:21:26.000000000
-0700

@@ -313,7 +313,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/picotux200_defconfig     2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/picotux200_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -291,7 +291,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
--- a/arch/arm/configs/qil-a9260_defconfig      2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/qil-a9260_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -333,7 +333,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/realview-smp_defconfig   2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/realview-smp_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -262,7 +262,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
--- a/arch/arm/configs/rpc_defconfig    2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/rpc_defconfig    2008-10-30 08:21:26.000000000
-0700

@@ -273,7 +273,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/s3c2410_defconfig        2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/s3c2410_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -390,7 +390,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
--- a/arch/arm/configs/sam9_l9260_defconfig     2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/sam9_l9260_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +5 ~~-10~~

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/spitz_defconfig  2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/spitz_defconfig  2008-10-30 08:21:26.000000000
-0700

@@ -363,7 +363,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/arm/configs/sx1_defconfig    2008-10-30 08:21:26.000000000
-0700
+++ b/arch/arm/configs/sx1_defconfig    2008-10-30 08:21:26.000000000
-0700

@@ -336,7 +336,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/trizeps4_defconfig       2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/trizeps4_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #
--- a/arch/arm/configs/usb-a9260_defconfig      2008-10-30

08:21:26.000000000 -0700
+++ b/arch/arm/configs/usb-a9260_defconfig 2008-10-30
08:21:26.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -333,7 +333,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/usb-a9263_defconfig      2008-10-30

08:21:27.000000000 -0700
+++ b/arch/arm/configs/usb-a9263_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -325,7 +325,7 @@ CONFIG_IP_PIMSM_V2=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/arm/configs/viper_defconfig  2008-10-30 08:21:27.000000000
-0700
+++ b/arch/arm/configs/viper_defconfig  2008-10-30 08:21:27.000000000
-0700

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/xm_x2xx_defconfig        2008-10-30

08:21:27.000000000 -0700
+++ b/arch/arm/configs/xm_x2xx_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -379,7 +379,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/arm/configs/yl9200_defconfig 2008-10-30 08:21:27.000000000
-0700
+++ b/arch/arm/configs/yl9200_defconfig 2008-10-30 08:21:27.000000000
-0700

@@ -299,7 +299,7 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
--- a/arch/arm/configs/zylonite_defconfig       2008-10-30

08:21:27.000000000 -0700
+++ b/arch/arm/configs/zylonite_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -292,7 +292,7 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/avr32/configs/atngw100_defconfig     2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/atngw100_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -269,7 +269,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig   2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig   2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -267,7 +267,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=y
--- a/arch/avr32/configs/atstk1002_defconfig    2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/atstk1002_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -270,7 +270,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/avr32/configs/atstk1003_defconfig    2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/atstk1003_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -261,7 +261,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/avr32/configs/atstk1004_defconfig    2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/atstk1004_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -205,7 +205,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/avr32/configs/atstk1006_defconfig    2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/atstk1006_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -270,7 +270,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/avr32/configs/favr-32_defconfig      2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/favr-32_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -263,7 +263,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/avr32/configs/mimc200_defconfig      2008-10-30

08:21:27.000000000 -0700
+++ b/arch/avr32/configs/mimc200_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -263,7 +263,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/blackfin/configs/BF526-EZBRD_defconfig       2008-10-30

08:21:27.000000000 -0700
+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -421,7 +421,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETLABEL is not set
--- a/arch/blackfin/configs/BF527-EZKIT_defconfig       2008-10-30

08:21:27.000000000 -0700
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -400,7 +400,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig       2008-10-30

08:21:27.000000000 -0700
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/BF533-STAMP_defconfig       2008-10-30

08:21:27.000000000 -0700
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/BF537-STAMP_defconfig       2008-10-30

08:21:27.000000000 -0700
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig 2008-10-30
08:21:27.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -376,7 +376,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig       2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -439,7 +439,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig       2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -410,7 +410,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/BlackStamp_defconfig        2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/BlackStamp_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -396,7 +396,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETLABEL is not set
--- a/arch/blackfin/configs/CM-BF527_defconfig  2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/CM-BF527_defconfig 2008-10-30 08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -403,7 +403,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/CM-BF533_defconfig  2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/CM-BF533_defconfig 2008-10-30 08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -361,7 +361,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/CM-BF537E_defconfig 2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/CM-BF537E_defconfig 2008-10-30 08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -372,7 +372,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/CM-BF537U_defconfig 2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/CM-BF537U_defconfig 2008-10-30 08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/CM-BF548_defconfig  2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/CM-BF548_defconfig 2008-10-30 08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -437,7 +437,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/CM-BF561_defconfig  2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/CM-BF561_defconfig 2008-10-30 08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -404,7 +404,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/H8606_defconfig     2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/H8606_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -361,7 +361,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/IP0X_defconfig      2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/IP0X_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -369,7 +369,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/blackfin/configs/PNAV-10_defconfig   2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/PNAV-10_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -366,7 +366,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/blackfin/configs/SRV1_defconfig      2008-10-30

08:21:28.000000000 -0700
+++ b/arch/blackfin/configs/SRV1_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -387,7 +387,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/cris/configs/artpec_3_defconfig      2008-10-30

08:21:28.000000000 -0700
+++ b/arch/cris/configs/artpec_3_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -205,7 +205,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/cris/configs/etrax-100lx_v2_defconfig        2008-10-30

08:21:28.000000000 -0700
+++ b/arch/cris/configs/etrax-100lx_v2_defconfig 2008-10-30
08:21:28.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -204,7 +204,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/cris/configs/etraxfs_defconfig       2008-10-30

08:21:29.000000000 -0700
+++ b/arch/cris/configs/etraxfs_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/ia64/configs/generic_defconfig       2008-10-30

08:21:29.000000000 -0700
+++ b/arch/ia64/configs/generic_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +5 ~~-10~~

@@ -323,7 +323,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/ia64/configs/tiger_defconfig 2008-10-30 08:21:29.000000000
-0700
+++ b/arch/ia64/configs/tiger_defconfig 2008-10-30 08:21:29.000000000
-0700

@@ -264,7 +264,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/ia64/configs/zx1_defconfig   2008-10-30 08:21:29.000000000
-0700
+++ b/arch/ia64/configs/zx1_defconfig   2008-10-30 08:21:29.000000000
-0700

@@ -261,7 +261,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #
--- a/arch/m32r/configs/m32104ut_defconfig      2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/m32104ut_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -191,7 +191,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/m32r/configs/m32700ut.smp_defconfig  2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/m32700ut.smp_defconfig 2008-10-30 08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -203,7 +203,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/m32700ut.up_defconfig   2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/m32700ut.up_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -200,7 +200,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/mappi.nommu_defconfig   2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/mappi.nommu_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/mappi.smp_defconfig     2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/mappi.smp_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -212,7 +212,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/mappi.up_defconfig      2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/mappi.up_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/mappi2.opsp_defconfig   2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/mappi2.opsp_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/mappi2.vdec2_defconfig  2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/mappi2.vdec2_defconfig 2008-10-30 08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/mappi3.smp_defconfig    2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/mappi3.smp_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -212,7 +212,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/oaks32r_defconfig       2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/oaks32r_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -193,7 +193,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/opsput_defconfig        2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m32r/configs/opsput_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +5 ~~-10~~

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m32r/configs/usrv_defconfig  2008-10-30 08:21:29.000000000
-0700
+++ b/arch/m32r/configs/usrv_defconfig  2008-10-30 08:21:29.000000000
-0700

@@ -215,7 +215,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/m68k/configs/amiga_defconfig 2008-10-30 08:21:29.000000000
-0700
+++ b/arch/m68k/configs/amiga_defconfig 2008-10-30 08:21:29.000000000
-0700

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/apollo_defconfig        2008-10-30

08:21:29.000000000 -0700
+++ b/arch/m68k/configs/apollo_defconfig 2008-10-30
08:21:29.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +3 -6

@@ -208,7 +208,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/atari_defconfig 2008-10-30 08:21:29.000000000
-0700
+++ b/arch/m68k/configs/atari_defconfig 2008-10-30 08:21:29.000000000
-0700

@@ -206,7 +206,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/bvme6000_defconfig      2008-10-30

08:21:30.000000000 -0700
+++ b/arch/m68k/configs/bvme6000_defconfig 2008-10-30
08:21:30.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +7 ~~-14~~

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/hp300_defconfig 2008-10-30 08:21:30.000000000
-0700
+++ b/arch/m68k/configs/hp300_defconfig 2008-10-30 08:21:30.000000000
-0700

@@ -209,7 +209,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/mac_defconfig   2008-10-30 08:21:30.000000000
-0700
+++ b/arch/m68k/configs/mac_defconfig   2008-10-30 08:21:30.000000000
-0700

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/multi_defconfig 2008-10-30 08:21:30.000000000
-0700
+++ b/arch/m68k/configs/multi_defconfig 2008-10-30 08:21:30.000000000
-0700

@@ -220,7 +220,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/mvme147_defconfig       2008-10-30

08:21:30.000000000 -0700
+++ b/arch/m68k/configs/mvme147_defconfig 2008-10-30
08:21:30.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/mvme16x_defconfig       2008-10-30

08:21:30.000000000 -0700
+++ b/arch/m68k/configs/mvme16x_defconfig 2008-10-30
08:21:30.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +7 ~~-14~~

@@ -210,7 +210,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/q40_defconfig   2008-10-30 08:21:30.000000000
-0700
+++ b/arch/m68k/configs/q40_defconfig   2008-10-30 08:21:30.000000000
-0700

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/sun3_defconfig  2008-10-30 08:21:30.000000000
-0700
+++ b/arch/m68k/configs/sun3_defconfig  2008-10-30 08:21:30.000000000
-0700

@@ -196,7 +196,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68k/configs/sun3x_defconfig 2008-10-30 08:21:30.000000000
-0700
+++ b/arch/m68k/configs/sun3x_defconfig 2008-10-30 08:21:30.000000000
-0700

@@ -207,7 +207,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/m68knommu/configs/m5208evb_defconfig 2008-10-30

08:21:30.000000000 -0700
+++ b/arch/m68knommu/configs/m5208evb_defconfig 2008-10-30 08:21:30.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -213,7 +213,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/m68knommu/configs/m5275evb_defconfig 2008-10-30

08:21:30.000000000 -0700
+++ b/arch/m68knommu/configs/m5275evb_defconfig 2008-10-30 08:21:30.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -216,7 +216,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/m68knommu/configs/m5307c3_defconfig  2008-10-30

08:21:30.000000000 -0700
+++ b/arch/m68knommu/configs/m5307c3_defconfig 2008-10-30 08:21:30.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -2

@@ -222,7 +222,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/m68knommu/configs/m5407c3_defconfig  2008-10-30

08:21:30.000000000 -0700
+++ b/arch/m68knommu/configs/m5407c3_defconfig 2008-10-30 08:21:30.000000000 -0700

net/ipv4/Kconfig 2008-10-30 08:31:32.000000000 -0700 renamed from net/ipv4/Kconfig 2008-10-30 08:18:10.000000000 -0700 +1 -1

@@ -218,7 +218,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -220,7 +220,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/bcm47xx_defconfig       2008-10-30

08:21:30.000000000 -0700
+++ b/arch/mips/configs/bcm47xx_defconfig 2008-10-30
08:26:00.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +4 ~~-21~~

@@ -320,26 +320,10 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_BIC=y
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
--- a/arch/mips/configs/bigsur_defconfig        2008-10-30

08:21:30.000000000 -0700
+++ b/arch/mips/configs/bigsur_defconfig 2008-10-30
08:21:30.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -353,7 +353,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
--- a/arch/mips/configs/capcella_defconfig      2008-10-30

08:21:30.000000000 -0700
+++ b/arch/mips/configs/capcella_defconfig 2008-10-30
08:21:30.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -276,7 +276,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/cobalt_defconfig        2008-10-30

08:21:30.000000000 -0700
+++ b/arch/mips/configs/cobalt_defconfig 2008-10-30
08:21:30.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/mips/configs/db1000_defconfig        2008-10-30

08:21:30.000000000 -0700
+++ b/arch/mips/configs/db1000_defconfig 2008-10-30
08:21:30.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/db1100_defconfig        2008-10-30

08:21:30.000000000 -0700
+++ b/arch/mips/configs/db1100_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -292,7 +292,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/db1200_defconfig        2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/db1200_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/db1500_defconfig        2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/db1500_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/db1550_defconfig        2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/db1550_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/decstation_defconfig    2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/decstation_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -293,7 +293,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
--- a/arch/mips/configs/emma2rh_defconfig       2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/emma2rh_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/excite_defconfig        2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/excite_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/fulong_defconfig        2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/fulong_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +11 ~~-22~~

@@ -297,7 +297,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/mips/configs/ip22_defconfig  2008-10-30 08:21:31.000000000
-0700
+++ b/arch/mips/configs/ip22_defconfig  2008-10-30 08:21:31.000000000
-0700

@@ -286,7 +286,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
--- a/arch/mips/configs/ip27_defconfig  2008-10-30 08:21:31.000000000
-0700
+++ b/arch/mips/configs/ip27_defconfig  2008-10-30 08:21:31.000000000
-0700

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/ip28_defconfig  2008-10-30 08:21:31.000000000
-0700
+++ b/arch/mips/configs/ip28_defconfig  2008-10-30 08:21:31.000000000
-0700

@@ -327,7 +327,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/ip32_defconfig  2008-10-30 08:21:31.000000000
-0700
+++ b/arch/mips/configs/ip32_defconfig  2008-10-30 08:21:31.000000000
-0700

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/jazz_defconfig  2008-10-30 08:21:31.000000000
-0700
+++ b/arch/mips/configs/jazz_defconfig  2008-10-30 08:21:31.000000000
-0700

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/jmr3927_defconfig       2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/jmr3927_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +5 ~~-10~~

@@ -281,7 +281,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
--- a/arch/mips/configs/lasat_defconfig 2008-10-30 08:21:31.000000000
-0700
+++ b/arch/mips/configs/lasat_defconfig 2008-10-30 08:21:31.000000000
-0700

@@ -262,7 +262,7 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/malta_defconfig 2008-10-30 08:21:31.000000000
-0700
+++ b/arch/mips/configs/malta_defconfig 2008-10-30 08:21:31.000000000
-0700

@@ -327,7 +327,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
--- a/arch/mips/configs/mipssim_defconfig       2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/mipssim_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -287,7 +287,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/mpc30x_defconfig        2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/mpc30x_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -273,7 +273,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/msp71xx_defconfig       2008-10-30

08:21:31.000000000 -0700
+++ b/arch/mips/configs/msp71xx_defconfig 2008-10-30
08:21:31.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +3 -6

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 
 #
--- a/arch/mips/configs/mtx1_defconfig  2008-10-30 08:21:32.000000000
-0700
+++ b/arch/mips/configs/mtx1_defconfig  2008-10-30 08:21:32.000000000
-0700

@@ -321,7 +321,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
--- a/arch/mips/configs/pb1100_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/pb1100_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/pb1500_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/pb1500_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/pb1550_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/pb1550_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/pnx8550-jbs_defconfig   2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/pnx8550-jbs_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -297,7 +297,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/pnx8550-stb810_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/pnx8550-stb810_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +6 ~~-25~~

@@ -295,7 +295,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/rb532_defconfig 2008-10-30 08:21:32.000000000
-0700
+++ b/arch/mips/configs/rb532_defconfig 2008-10-30 08:26:46.000000000
-0700

@@ -306,26 +306,10 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=y
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="vegas"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/mips/configs/rbtx49xx_defconfig      2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/rbtx49xx_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +3 -6

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
--- a/arch/mips/configs/rm200_defconfig 2008-10-30 08:21:32.000000000
-0700
+++ b/arch/mips/configs/rm200_defconfig 2008-10-30 08:21:32.000000000
-0700

@@ -314,7 +314,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 
 #
--- a/arch/mips/configs/sb1250-swarm_defconfig  2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/sb1250-swarm_defconfig 2008-10-30 08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -352,7 +352,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
--- a/arch/mips/configs/tb0219_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/tb0219_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -311,7 +311,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
--- a/arch/mips/configs/tb0226_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/tb0226_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
--- a/arch/mips/configs/tb0287_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/tb0287_defconfig 2008-10-30
08:27:08.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +4 ~~-21~~

@@ -308,26 +308,10 @@ CONFIG_INET_TUNNEL=m
 # CONFIG_INET_LRO is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-CONFIG_DEFAULT_BIC=y
-# CONFIG_DEFAULT_CUBIC is not set
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="bic"
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_HTCP=y
+CONFIG_DEFAULT_HTCP=y
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
--- a/arch/mips/configs/workpad_defconfig       2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/workpad_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -282,7 +282,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/wrppmc_defconfig        2008-10-30

08:21:32.000000000 -0700
+++ b/arch/mips/configs/wrppmc_defconfig 2008-10-30
08:21:32.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_TCP_MD5SIG=y
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/mips/configs/yosemite_defconfig      2008-10-30

08:21:33.000000000 -0700
+++ b/arch/mips/configs/yosemite_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -297,7 +297,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
--- a/arch/mn10300/configs/asb2303_defconfig    2008-10-30

08:21:33.000000000 -0700
+++ b/arch/mn10300/configs/asb2303_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +3 -6

@@ -191,7 +191,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
--- a/arch/parisc/configs/712_defconfig 2008-10-30 08:21:33.000000000
-0700
+++ b/arch/parisc/configs/712_defconfig 2008-10-30 08:21:33.000000000
-0700

@@ -201,7 +201,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/parisc/configs/a500_defconfig        2008-10-30

08:21:33.000000000 -0700
+++ b/arch/parisc/configs/a500_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -232,7 +232,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/parisc/configs/b180_defconfig        2008-10-30

08:21:33.000000000 -0700
+++ b/arch/parisc/configs/b180_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -192,7 +192,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
--- a/arch/parisc/configs/c3000_defconfig       2008-10-30

08:21:33.000000000 -0700
+++ b/arch/parisc/configs/c3000_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -202,7 +202,7 @@ CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/parisc/configs/default_defconfig     2008-10-30

08:21:33.000000000 -0700
+++ b/arch/parisc/configs/default_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -228,7 +228,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/powerpc/configs/40x/acadia_defconfig 2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/40x/acadia_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/40x/ep405_defconfig  2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/40x/ep405_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -301,7 +301,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/40x/hcu4_defconfig   2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/40x/hcu4_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -294,7 +294,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/40x/kilauea_defconfig        2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/40x/kilauea_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/40x/makalu_defconfig 2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/40x/makalu_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -299,7 +299,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/40x/walnut_defconfig 2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/40x/walnut_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -302,7 +302,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/arches_defconfig 2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/44x/arches_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/bamboo_defconfig 2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/44x/bamboo_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -310,7 +310,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/canyonlands_defconfig    2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/44x/canyonlands_defconfig 2008-10-30
08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -305,7 +305,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/ebony_defconfig  2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/44x/ebony_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/katmai_defconfig 2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/44x/katmai_defconfig 2008-10-30 08:21:33.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -304,7 +304,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/rainier_defconfig        2008-10-30

08:21:33.000000000 -0700
+++ b/arch/powerpc/configs/44x/rainier_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/sam440ep_defconfig       2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/sequoia_defconfig        2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/44x/sequoia_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -309,7 +309,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/taishan_defconfig        2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/44x/taishan_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -308,7 +308,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/44x/virtex5_defconfig        2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/44x/virtex5_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -315,7 +315,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
--- a/arch/powerpc/configs/44x/warp_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/44x/warp_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -306,7 +306,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
--- a/arch/powerpc/configs/52xx/cm5200_defconfig        2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -298,7 +298,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig     2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -313,7 +313,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/52xx/motionpro_defconfig     2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -298,7 +298,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/52xx/pcm030_defconfig        2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -303,7 +303,7 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig       2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/asp8347_defconfig       2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -331,7 +331,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -331,7 +331,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig 2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig 2008-10-30 08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig   2008-10-30

08:21:34.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig 2008-10-30
08:21:34.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -332,7 +332,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig   2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -325,7 +325,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig       2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -328,7 +328,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/85xx/ksi8560_defconfig       2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -301,7 +301,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/85xx/mpc8536_ds_defconfig    2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -329,7 +329,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig   2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -303,7 +303,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig    2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig   2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -312,7 +312,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig    2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -315,7 +315,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETWORK_SECMARK is not set
--- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig    2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig 2008-10-30
08:21:35.000000000 -0700

arch/m68knommu/defconfig 2008-10-30 08:21:30.000000000 -0700 +1 -2

@@ -330,7 +330,7 @@ CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="htcp"
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   2008-10-30

08:21:35.000000000 -0700
+++ b/arch/powerpc...

[Message clipped]

David Miller

maintainer

2008-11-02 04:30 UTC #15 lore raw

Re: [RFC] tcp: make H-TCP the default congestion control

In reply to Stephen Hemminger

From: Stephen Hemminger <[email protected]>
Date: Fri, 31 Oct 2008 12:16:25 -0700

Quoted 10 lines

The new version of CUBIC is not as tested as H-TCP. Therefore it is prudent to make H-TCP the default congestion control for one (or more) releases until the new HyStart code has been real world tested.
This is likely to generate interesting discussion and testing. Both H-TCP and CUBIC are robust. For most users, there will be no perceivable difference, but for users with excessively large queues (DSL ISPs) H-TCP is more fair. One CUBIC flow fills the queue, and the second flow never pushes hard enough to cause fairness.

Quoted 6 lines

For researchers with very high speed networks
with switches with minuscule queues, CUBIC works better. H-TCP sees the packet loss from the small queue and reduces sending rate.
Signed-off-by Stephen Hemminger <[email protected]>

I'm not so sure about this logic, regardless of the algorithms involved.

H-TCP was never the default in any distribution or release that I know of. So it's real world exposure is effectively zero, which is the same as the new CUBIC stuff.

They are effectively, therefore, equivalent choices.

Besides, Koreans are perfect so we actually have nothing to worry about :-)

David Miller

maintainer

2008-11-02 07:28 UTC #16 lore raw

In reply to Injong Rhee

From: "Injong Rhee" <[email protected]>
Date: Wed, 29 Oct 2008 17:28:26 -0400

Quoted 4 lines

I am releasing a new patch for CUBIC. This patch implements a new slow start mechanism called HyStart. There were some discussions in the mailing list on the poor performance of TCP slow start; our patch addresses those performance issues arising from slow start.

I'm applying this patch to net-next-2.6 for three reasons:

1) it is easily the cleanest and most well done CUBIC patch submission, and they should be rewarded for the quality of this work

2) the only way to get exposure is to merge this now and look out for problems, and yes that means keeping it the default

3) if there is a problem it's a one line change to revert to previous CUBIC behvaior, by setting hystart to 0, and that's always a safe alternative because that is pretty much what is deployed all over the world right now

Thanks!

Sangtae Ha

2008-11-03 22:19 UTC #17 lore raw

Hi all,

We had rather extensive testings with one MacOSX receiver of the latest Leopard release.
As we had one macbook pro available in the lab, all the testing results are with the one receiver.
Based on the tested results, MacOSX also doesn't break the algorithm.

Please see the results at the following:

http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing#Testing_with_MacOSX

One thing I observed with FreeBSD and MacOS receivers is that even though we set the large send and recv buffer and run the iperf with the large fixed memory,
without manually setting the window scale parameter to a higher value, the receiver window is limited to 64K << 3 (which is the default of MacOSX).

Because of that, I had to set the window scailing parameter from 3 to 13 manually.
This also affects SACK not triggering with the default window scale factor of 3. Linux certainly doesn't have this problem.

Probably, MacOSX and FreeBSD may need some updates for this issue.

Thank you for all your feedbacks,

Sangtae

Quoted 13 lines · David Miller

I'm applying this patch to net-next-2.6 for three reasons:
1) it is easily the cleanest and most well done CUBIC patch submission, and they should be rewarded for the quality of this work
2) the only way to get exposure is to merge this now and look out for problems, and yes that means keeping it the default
3) if there is a problem it's a one line change to revert to previous CUBIC behvaior, by setting hystart to 0, and that's always a safe alternative because that is pretty much what is deployed all over the world right now

Stephen Hemminger

2008-11-03 22:49 UTC #18 lore raw

Quoted 23 lines · On Mon, 3 Nov 2008 17:19:52 -0500 "Sangtae Ha" <[email protected]> wrote:

Hi all,
We had rather extensive testings with one MacOSX receiver of the latest Leopard release.
As we had one macbook pro available in the lab, all the testing results are with the one receiver.
Based on the tested results, MacOSX also doesn't break the algorithm.
Please see the results at the following:
http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing#Testing_with_MacOSX
One thing I observed with FreeBSD and MacOS receivers is that even though we set the large send and recv buffer and run the iperf with the large fixed memory,
without manually setting the window scale parameter to a higher value, the receiver window is limited to 64K << 3 (which is the default of MacOSX).
Because of that, I had to set the window scailing parameter from 3 to 13 manually.
This also affects SACK not triggering with the default window scale factor of 3. Linux certainly doesn't have this problem.

Quoted 5 lines

Probably, MacOSX and FreeBSD may need some updates for this issue.
Thank you for all your feedbacks,
Sangtae

Thanks for the pro-active testing.

David Miller

maintainer

2008-11-04 01:13 UTC #19 lore raw

In reply to Sangtae Ha

From: "Sangtae Ha" <[email protected]>
Date: Mon, 3 Nov 2008 17:19:52 -0500

Quoted 9 lines

We had rather extensive testings with one MacOSX receiver of the latest Leopard release.
As we had one macbook pro available in the lab, all the testing results are with the one receiver.
Based on the tested results, MacOSX also doesn't break the algorithm.
Please see the results at the following:
http://netsrv.csc.ncsu.edu/wiki/index.php/TCP_Testing#Testing_with_MacOSX

Just like Stephen, I'd like to thank you for doing this testing.