mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
[TCP] FRTO: Use of existing funcs make code more obvious & robust
Though there's little need for everything that tcp_may_send_now does (actually, even the state had to be adjusted to pass some checks FRTO does not want to occur), it's more robust to let it make the decision if sending is allowed. State adjustments needed: - Make sure snd_cwnd limit is not hit in there - Disable nagle (if necessary) through the frto_counter == 2 The result of check for frto_counter in argument to call for tcp_enter_frto_loss can just be open coded, therefore there isn't need to store the previous frto_counter past tcp_may_send_now. In addition, returns can then be combined. Signed-off-by: Ilpo Jrvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
92b05e13f1
commit
3e6f049e0c
1 changed files with 5 additions and 9 deletions
|
@ -3003,17 +3003,13 @@ static int tcp_process_frto(struct sock *sk, int flag)
|
|||
}
|
||||
|
||||
if (tp->frto_counter == 1) {
|
||||
/* Sending of the next skb must be allowed or no F-RTO */
|
||||
if (!tcp_send_head(sk) ||
|
||||
after(TCP_SKB_CB(tcp_send_head(sk))->end_seq,
|
||||
tp->snd_una + tp->snd_wnd)) {
|
||||
tcp_enter_frto_loss(sk, (tp->frto_counter == 1 ? 2 : 3),
|
||||
flag);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* tcp_may_send_now needs to see updated state */
|
||||
tp->snd_cwnd = tcp_packets_in_flight(tp) + 2;
|
||||
tp->frto_counter = 2;
|
||||
|
||||
if (!tcp_may_send_now(sk))
|
||||
tcp_enter_frto_loss(sk, 2, flag);
|
||||
|
||||
return 1;
|
||||
} else {
|
||||
switch (sysctl_tcp_frto_response) {
|
||||
|
|
Loading…
Reference in a new issue