|
@@ -5783,11 +5783,9 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
|
|
|
|
|
|
/* tcp_ack considers this ACK as duplicate
|
|
/* tcp_ack considers this ACK as duplicate
|
|
* and does not calculate rtt.
|
|
* and does not calculate rtt.
|
|
- * Fix it at least with timestamps.
|
|
|
|
|
|
+ * Force it here.
|
|
*/
|
|
*/
|
|
- if (tp->rx_opt.saw_tstamp &&
|
|
|
|
- tp->rx_opt.rcv_tsecr && !tp->srtt)
|
|
|
|
- tcp_ack_saw_tstamp(sk, 0);
|
|
|
|
|
|
+ tcp_ack_update_rtt(sk, 0, 0);
|
|
|
|
|
|
if (tp->rx_opt.tstamp_ok)
|
|
if (tp->rx_opt.tstamp_ok)
|
|
tp->advmss -= TCPOLEN_TSTAMP_ALIGNED;
|
|
tp->advmss -= TCPOLEN_TSTAMP_ALIGNED;
|