Commit d738cd8f authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller

[TCP]: Add highest_sack seqno, points to globally highest SACK

It is guaranteed to be valid only when !tp->sacked_out. In most
cases this seqno is available in the last ACK but there is no
guarantee for that. The new fast recovery loss marking algorithm
needs this as entry point.
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d961db35
...@@ -333,6 +333,8 @@ struct tcp_sock { ...@@ -333,6 +333,8 @@ struct tcp_sock {
struct tcp_sack_block_wire recv_sack_cache[4]; struct tcp_sack_block_wire recv_sack_cache[4];
u32 highest_sack; /* Start seq of globally highest revd SACK (valid only in slowpath) */
/* from STCP, retrans queue hinting */ /* from STCP, retrans queue hinting */
struct sk_buff* lost_skb_hint; struct sk_buff* lost_skb_hint;
......
...@@ -979,8 +979,10 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ ...@@ -979,8 +979,10 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
int i; int i;
int first_sack_index; int first_sack_index;
if (!tp->sacked_out) if (!tp->sacked_out) {
tp->fackets_out = 0; tp->fackets_out = 0;
tp->highest_sack = tp->snd_una;
}
prior_fackets = tp->fackets_out; prior_fackets = tp->fackets_out;
/* Check for D-SACK. */ /* Check for D-SACK. */
...@@ -1217,6 +1219,10 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_ ...@@ -1217,6 +1219,10 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
if (fack_count > tp->fackets_out) if (fack_count > tp->fackets_out)
tp->fackets_out = fack_count; tp->fackets_out = fack_count;
if (after(TCP_SKB_CB(skb)->seq,
tp->highest_sack))
tp->highest_sack = TCP_SKB_CB(skb)->seq;
} else { } else {
if (dup_sack && (sacked&TCPCB_RETRANS)) if (dup_sack && (sacked&TCPCB_RETRANS))
reord = min(fack_count, reord); reord = min(fack_count, reord);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment