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

Commit 8512430e authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[TCP]: Move FRTO checks out from write queue abstraction funcs 



Better place exists in update_send_head (other non-queue related
adjustments are done there as well) which is the only caller of
tcp_advance_send_head (now that the bogus call from mtu_probe is
gone).

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82d8a867

include/net/tcp.h

+0 −5
Original line number Diff line number Diff line
@@ -1236,14 +1236,9 @@ static inline struct sk_buff *tcp_send_head(struct sock *sk) 


static inline void tcp_advance_send_head(struct sock *sk, struct sk_buff *skb)

{

	struct tcp_sock *tp = tcp_sk(sk);



	sk->sk_send_head = skb->next;

	if (sk->sk_send_head == (struct sk_buff *)&sk->sk_write_queue)

		sk->sk_send_head = NULL;

	/* Don't override Nagle indefinately with F-RTO */

	if (tp->frto_counter == 2)

		tp->frto_counter = 3;

}



static inline void tcp_check_send_head(struct sock *sk, struct sk_buff *skb_unlinked)

net/ipv4/tcp_output.c

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ static void update_send_head(struct sock *sk, struct sk_buff *skb) 
	tcp_advance_send_head(sk, skb);

	tp->snd_nxt = TCP_SKB_CB(skb)->end_seq;

	tcp_packets_out_inc(sk, skb);



	/* Don't override Nagle indefinately with F-RTO */

	if (tp->frto_counter == 2)

		tp->frto_counter = 3;

}



/* SND.NXT, if window was not shrunk.