Skip to contentSkip to conversation

tcp: Fix tcp_prequeue() to get correct rto_min value

PATCH In review Satoru SATOH 1 participant 1 message May 2, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tcp: Fix tcp_prequeue() to get correct rto_min value

tcp_prequeue() refers to the constant value (TCP_RTO_MIN) regardless of the actual value. The following patches fix this and make tcp_prequeue get the correct value returns from tcp_rto_min().

The first patch moves the definition of tcp_rto_min() to the header file to make tcp_prequeue() can call it.

---
 include/net/tcp.h    |   12 ++++++++++++
 net/ipv4/tcp_input.c |   10 ----------
 2 files changed, 12 insertions(+), 10 deletions(-)
include/net/tcp.h +12 -0
index b55b489..284cc68 100644
@@ -41,6 +41,7 @@
 #include <net/ip.h>
 #include <net/tcp_states.h>
 #include <net/inet_ecn.h>
+#include <net/dst.h>
 
 #include <linux/seq_file.h>
 
@@ -543,6 +544,17 @@ 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.
net/ipv4/tcp_input.c +0 -10
index c96a6bb..eec3e6f 100644
@@ -597,16 +597,6 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb)
 		tcp_grow_window(sk, skb);
 }
 
-static 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;
-}
-
 /* Called to compute a smoothed rtt estimate. The data fed to this
  * routine either comes from timestamps, or from segments that were
  * known _not_ to have been retransmitted [see Karn/Partridge
Signature · 1 line
1.6.2.2