[<prev] [next>] [day] [month] [year] [list]
Message-id: <4B635E25.8080502@tvk.rwth-aachen.de>
Date: Fri, 29 Jan 2010 23:16:05 +0100
From: Damian Lukowski <damian@....rwth-aachen.de>
To: Netdev <netdev@...r.kernel.org>
Subject: [PATCH 3/3][v2] tcp: fix ICMP-RTO war: Code beautification
Rearranged functions and removed function prototype.
Signed-off-by: Damian Lukowski <damian@....rwth-aachen.de>
---
include/net/tcp.h | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index ff6cbaa..2a9ced8 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -528,7 +528,17 @@ static inline void tcp_bound_rto(const struct sock *sk)
inet_csk(sk)->icsk_rto = TCP_RTO_MAX;
}
-static inline u32 tcp_rto_min(struct sock *sk);
+/* Compute the actual rto_min value */
+static inline u32 tcp_rto_min(struct sock *sk)
+{
+ struct dst_entry *dst = __sk_dst_get(sk);
+ u32 rto_min = TCP_RTO_MIN;
+
+ if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
+ rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN);
+ return rto_min;
+}
+
static inline u32 __tcp_set_rto(const struct tcp_sock *tp)
{
u32 rto = (tp->srtt >> 3) + tp->rttvar;
@@ -559,17 +569,6 @@ static inline void tcp_fast_path_check(struct sock *sk)
tcp_fast_path_on(tp);
}
-/* Compute the actual rto_min value */
-static inline u32 tcp_rto_min(struct sock *sk)
-{
- struct dst_entry *dst = __sk_dst_get(sk);
- u32 rto_min = TCP_RTO_MIN;
-
- if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
- rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN);
- return rto_min;
-}
-
/* Compute the actual receive window we are currently advertising.
* Rcv_nxt can be after the window if our peer push more data
* than the offered window.
--
1.6.4.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists