Commit 534a2109 authored by Yuchung Cheng's avatar Yuchung Cheng Committed by David S. Miller
Browse files

tcp: consolidate tcp_mark_skb_lost and tcp_skb_mark_lost 



tcp_skb_mark_lost is used by RFC6675-SACK and can easily be replaced
with the new tcp_mark_skb_lost handler.

Signed-off-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68698970

net/ipv4/tcp_input.c

+2 −12
Original line number Diff line number Diff line
@@ -1043,17 +1043,6 @@ void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb) 
	}

}



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

{

	if (!(TCP_SKB_CB(skb)->sacked & (TCPCB_LOST|TCPCB_SACKED_ACKED))) {

		tcp_verify_retransmit_hint(tp, skb);



		tp->lost_out += tcp_skb_pcount(skb);

		tcp_sum_lost(tp, skb);

		TCP_SKB_CB(skb)->sacked |= TCPCB_LOST;

	}

}



/* Updates the delivered and delivered_ce counts */

static void tcp_count_delivered(struct tcp_sock *tp, u32 delivered,

				bool ece_ack)
@@ -2308,7 +2297,8 @@ static void tcp_mark_head_lost(struct sock *sk, int packets, int mark_head) 
		if (cnt > packets)

			break;



		tcp_skb_mark_lost(tp, skb);

		if (!(TCP_SKB_CB(skb)->sacked & TCPCB_LOST))

			tcp_mark_skb_lost(sk, skb);



		if (mark_head)

			break;