From d1578767165ecb4d82897b2d9a48d91697d0fa85 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 13 Dec 2005 23:13:13 -0800
Subject: [PATCH] --- yaml --- r: 15519 b: refs/heads/master c:
 05d054503a9c4652212b8730150608787547ecc3 h: refs/heads/master i:   15517:
 4214f07e00f7ea895266ab1657e41a16b93c1320   15515:
 f4b2efb8107ff31c627ad996128ecf01524c292d   15511:
 4296121bedf892ab13cbeef7ec44842efda2b666   15503:
 876003036926414eed33251afabec546e65507ba   15487:
 30c37efe9a49266212301b8e8d6b0c4ec6a228bf v: v3

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

diff --git a/[refs] b/[refs]
index fdfa11168f75..ef72623df79c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 018da8f44c066d5fc390011b8c953135f973b3a9
+refs/heads/master: 05d054503a9c4652212b8730150608787547ecc3
diff --git a/trunk/net/ipv4/tcp_bic.c b/trunk/net/ipv4/tcp_bic.c
index cf8c75f08efa..035f2092d73a 100644
--- a/trunk/net/ipv4/tcp_bic.c
+++ b/trunk/net/ipv4/tcp_bic.c
@@ -210,14 +210,14 @@ static void bictcp_state(struct sock *sk, u8 new_state)
 		bictcp_reset(inet_csk_ca(sk));
 }
 
-/* Track delayed acknowledgement ratio using sliding window
+/* Track delayed acknowledgment ratio using sliding window
  * ratio = (15*ratio + sample) / 16
  */
 static void bictcp_acked(struct sock *sk, u32 cnt)
 {
 	const struct inet_connection_sock *icsk = inet_csk(sk);
 
-	if (cnt > 0 && 	icsk->icsk_ca_state == TCP_CA_Open) {
+	if (cnt > 0 && icsk->icsk_ca_state == TCP_CA_Open) {
 		struct bictcp *ca = inet_csk_ca(sk);
 		cnt -= ca->delayed_ack >> ACK_RATIO_SHIFT;
 		ca->delayed_ack += cnt;