From 2beb12915bea55897250ede4de1762a60244837b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 20 Jul 2007 00:17:45 +0100
Subject: [PATCH] --- yaml --- r: 61881 b: refs/heads/master c:
 c65c5131b349b08f3292b1cd10239cf376bfcb15 h: refs/heads/master i:   61879:
 d528c2deb5448ab2fb165279766682f1dda0125e v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_htcp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9902232c6941..7adb17017883 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 721e2629fa2167c0e5a9f10d704b1fee1621a8cb
+refs/heads/master: c65c5131b349b08f3292b1cd10239cf376bfcb15
diff --git a/trunk/net/ipv4/tcp_htcp.c b/trunk/net/ipv4/tcp_htcp.c
index 632c05a75883..08a02e6045c9 100644
--- a/trunk/net/ipv4/tcp_htcp.c
+++ b/trunk/net/ipv4/tcp_htcp.c
@@ -225,7 +225,7 @@ static u32 htcp_recalc_ssthresh(struct sock *sk)
 	return max((tp->snd_cwnd * ca->beta) >> 7, 2U);
 }
 
-static void htcp_cong_avoid(struct sock *sk, u32 ack, s32 rtt,
+static void htcp_cong_avoid(struct sock *sk, u32 ack,
 			    u32 in_flight, int data_acked)
 {
 	struct tcp_sock *tp = tcp_sk(sk);