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

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

[TCP]: clear_all_retrans_hints prefixed by tcp_ 



In addition, fix its function comment spacing.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
parent 91fed7a1

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ static inline void tcp_mib_init(void) 
}



/* from STCP */

static inline void clear_all_retrans_hints(struct tcp_sock *tp){

static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp) {

	tp->lost_skb_hint = NULL;

	tp->scoreboard_skb_hint = NULL;

	tp->retransmit_skb_hint = NULL;

net/ipv4/tcp_input.c

+5 −5
Original line number Diff line number Diff line
@@ -1667,7 +1667,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag) 
	tp->high_seq = tp->frto_highmark;

	TCP_ECN_queue_cwr(tp);



	clear_all_retrans_hints(tp);

	tcp_clear_all_retrans_hints(tp);

}



void tcp_clear_retrans(struct tcp_sock *tp)
@@ -1738,7 +1738,7 @@ void tcp_enter_loss(struct sock *sk, int how) 
	/* Abort FRTO algorithm if one is in progress */

	tp->frto_counter = 0;



	clear_all_retrans_hints(tp);

	tcp_clear_all_retrans_hints(tp);

}



static int tcp_check_sack_reneging(struct sock *sk)
@@ -2103,7 +2103,7 @@ static void tcp_undo_cwr(struct sock *sk, const int undo) 


	/* There is something screwy going on with the retrans hints after

	   an undo */

	clear_all_retrans_hints(tp);

	tcp_clear_all_retrans_hints(tp);

}



static inline int tcp_may_undo(struct tcp_sock *tp)
@@ -2196,7 +2196,7 @@ static int tcp_try_undo_loss(struct sock *sk) 
			TCP_SKB_CB(skb)->sacked &= ~TCPCB_LOST;

		}



		clear_all_retrans_hints(tp);

		tcp_clear_all_retrans_hints(tp);



		DBGUNDO(sk, "partial loss");

		tp->lost_out = 0;
@@ -2656,7 +2656,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p) 
		tp->packets_out -= tcp_skb_pcount(skb);

		tcp_unlink_write_queue(skb, sk);

		sk_stream_free_skb(sk, skb);

		clear_all_retrans_hints(tp);

		tcp_clear_all_retrans_hints(tp);

	}



	if (acked&FLAG_ACKED) {

net/ipv4/tcp_output.c

+3 −3
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss 


	BUG_ON(len > skb->len);



	clear_all_retrans_hints(tp);

	tcp_clear_all_retrans_hints(tp);

	nsize = skb_headlen(skb) - len;

	if (nsize < 0)

		nsize = 0;
@@ -1719,7 +1719,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int m 
		       tcp_skb_pcount(next_skb) != 1);



		/* changing transmit queue under us so clear hints */

		clear_all_retrans_hints(tp);

		tcp_clear_all_retrans_hints(tp);



		/* Ok.	We will be able to collapse the packet. */

		tcp_unlink_write_queue(next_skb, sk);
@@ -1792,7 +1792,7 @@ void tcp_simple_retransmit(struct sock *sk) 
		}

	}



	clear_all_retrans_hints(tp);

	tcp_clear_all_retrans_hints(tp);



	if (!lost)

		return;