Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c266898 authored by Satoru SATOH's avatar Satoru SATOH Committed by David S. Miller
Browse files

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 might be tuned. The following patches fix this and make
tcp_prequeue get the actual value returns from tcp_rto_min().

Signed-off-by: default avatarSatoru SATOH <satoru.satoh@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b2febf3

include/net/tcp.h

+13 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <net/ip.h>

#include <net/ip.h>

#include <net/tcp_states.h>

#include <net/tcp_states.h>

#include <net/inet_ecn.h>

#include <net/inet_ecn.h>

#include <net/dst.h>





#include <linux/seq_file.h>

#include <linux/seq_file.h>
@@ -530,6 +531,17 @@ static inline void tcp_fast_path_check(struct sock *sk) 
		tcp_fast_path_on(tp);

		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.

/* Compute the actual receive window we are currently advertising.

 * Rcv_nxt can be after the window if our peer push more data

 * Rcv_nxt can be after the window if our peer push more data

 * than the offered window.

 * than the offered window.
@@ -895,7 +907,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb) 
			wake_up_interruptible(sk->sk_sleep);

			wake_up_interruptible(sk->sk_sleep);

			if (!inet_csk_ack_scheduled(sk))

			if (!inet_csk_ack_scheduled(sk))

				inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,

				inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,

						          (3 * TCP_RTO_MIN) / 4,

						          (3 * tcp_rto_min(sk)) / 4,

							  TCP_RTO_MAX);

							  TCP_RTO_MAX);

		}

		}

		return 1;

		return 1;

net/ipv4/tcp_input.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -597,16 +597,6 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb) 
		tcp_grow_window(sk, 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

/* Called to compute a smoothed rtt estimate. The data fed to this

 * routine either comes from timestamps, or from segments that were

 * routine either comes from timestamps, or from segments that were

 * known _not_ to have been retransmitted [see Karn/Partridge

 * known _not_ to have been retransmitted [see Karn/Partridge