Subject: [PATCH 1/2] net-next-2.6: SYN retransmits: Rename threshold variable

From: Damian Lukowski <[email-masked]>
Date: Tue, 28 Sep 2010 21:45:44 +0200

This preparatory patch renames the threshold variable in
retransmits_timed_out() for proper code style.

Signed-off-by: Damian Lukowski <[email-masked]>
---
 net/ipv4/tcp_timer.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index baea4a1..98cbc60 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -141,7 +141,7 @@ static bool retransmits_timed_out(struct sock *sk,
 				  unsigned int boundary,
 				  unsigned int timeout)
 {
-	unsigned int linear_backoff_thresh, start_ts;
+	unsigned int backoff_thresh, start_ts;
 
 	if (!inet_csk(sk)->icsk_retransmits)
 		return false;
@@ -152,13 +152,13 @@ static bool retransmits_timed_out(struct sock *sk,
 		start_ts = tcp_sk(sk)->retrans_stamp;
 
 	if (likely(timeout == 0)) {
-		linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
+		backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
 
-		if (boundary <= linear_backoff_thresh)
+		if (boundary <= backoff_thresh)
 			timeout = ((2 << boundary) - 1) * TCP_RTO_MIN;
 		else
-			timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN +
-				(boundary - linear_backoff_thresh) * TCP_RTO_MAX;
+			timeout = ((2 << backoff_thresh) - 1) * TCP_RTO_MIN +
+				  (boundary - backoff_thresh) * TCP_RTO_MAX;
 	}
 	return (tcp_time_stamp - start_ts) >= timeout;
 }
-- 
1.7.2.2