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

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

tcp: Partial hint clearing has again become meaningless 



Ie., the difference between partial and all clearing doesn't
exists anymore since the SACK optimizations got dropped by
an sacktag rewrite.

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

include/net/tcp.h

+1 −6
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ static inline void tcp_mib_init(struct net *net) 
}



/* from STCP */

static inline void tcp_clear_retrans_hints_partial(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;
@@ -1043,11 +1043,6 @@ static inline void tcp_clear_retrans_hints_partial(struct tcp_sock *tp) 
	tp->forward_skb_hint = NULL;

}



static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp)

{

	tcp_clear_retrans_hints_partial(tp);

}



/* MD5 Signature */

struct crypto_hash;

net/ipv4/tcp_input.c

+2 −3
Original line number Diff line number Diff line
@@ -1883,7 +1883,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag) 
	tp->high_seq = tp->snd_nxt;

	TCP_ECN_queue_cwr(tp);



	tcp_clear_retrans_hints_partial(tp);

	tcp_clear_all_retrans_hints(tp);

}



static void tcp_clear_retrans_partial(struct tcp_sock *tp)
@@ -1934,12 +1934,11 @@ void tcp_enter_loss(struct sock *sk, int how) 
		/* Push undo marker, if it was plain RTO and nothing

		 * was retransmitted. */

		tp->undo_marker = tp->snd_una;

		tcp_clear_retrans_hints_partial(tp);

	} else {

		tp->sacked_out = 0;

		tp->fackets_out = 0;

		tcp_clear_all_retrans_hints(tp);

	}

	tcp_clear_all_retrans_hints(tp);



	tcp_for_write_queue(skb, sk) {

		if (skb == tcp_send_head(sk))

net/ipv4/tcp_output.c

+2 −2
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, 


	BUG_ON(len > skb->len);



	tcp_clear_retrans_hints_partial(tp);

	tcp_clear_all_retrans_hints(tp);

	nsize = skb_headlen(skb) - len;

	if (nsize < 0)

		nsize = 0;
@@ -1823,7 +1823,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, 
	tp->packets_out -= tcp_skb_pcount(next_skb);



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

	tcp_clear_retrans_hints_partial(tp);

	tcp_clear_all_retrans_hints(tp);



	sk_wmem_free_skb(sk, next_skb);

}