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

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

tcp: move tcp_verify_retransmit_hint 



Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 64edc273

net/ipv4/tcp_input.c

+13 −13
Original line number Diff line number Diff line
@@ -979,6 +979,19 @@ static void tcp_update_reordering(struct sock *sk, const int metric, 
	}

}



/* RFC: This is from the original, I doubt that this is necessary at all:

 * clear xmit_retrans hint if seq of this skb is beyond hint. How could we

 * retransmitted past LOST markings in the first place? I'm not fully sure

 * about undo and end of connection cases, which can cause R without L?

 */

static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb)

{

	if ((tp->retransmit_skb_hint != NULL) &&

	    before(TCP_SKB_CB(skb)->seq,

		   TCP_SKB_CB(tp->retransmit_skb_hint)->seq))

		tp->retransmit_skb_hint = NULL;

}



/* This procedure tags the retransmission queue when SACKs arrive.

 *

 * We have three tag bits: SACKED(S), RETRANS(R) and LOST(L).
@@ -2156,19 +2169,6 @@ static int tcp_time_to_recover(struct sock *sk) 
	return 0;

}



/* RFC: This is from the original, I doubt that this is necessary at all:

 * clear xmit_retrans hint if seq of this skb is beyond hint. How could we

 * retransmitted past LOST markings in the first place? I'm not fully sure

 * about undo and end of connection cases, which can cause R without L?

 */

static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb)

{

	if ((tp->retransmit_skb_hint != NULL) &&

	    before(TCP_SKB_CB(skb)->seq,

		   TCP_SKB_CB(tp->retransmit_skb_hint)->seq))

		tp->retransmit_skb_hint = NULL;

}



/* Mark head of queue up as lost. With RFC3517 SACK, the packets is

 * is against sacked "cnt", otherwise it's against facked "cnt"

 */