Skip to content

Commit

Permalink
[TCP]: Add highest_sack seqno, points to globally highest SACK
Browse files Browse the repository at this point in the history
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: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ilpo Järvinen authored and David S. Miller committed Oct 10, 2007
1 parent d961db3 commit d738cd8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions include/linux/tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,8 @@ struct tcp_sock {

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 */
struct sk_buff* lost_skb_hint;

Expand Down
8 changes: 7 additions & 1 deletion net/ipv4/tcp_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -979,8 +979,10 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
int i;
int first_sack_index;

if (!tp->sacked_out)
if (!tp->sacked_out) {
tp->fackets_out = 0;
tp->highest_sack = tp->snd_una;
}
prior_fackets = tp->fackets_out;

/* Check for D-SACK. */
Expand Down Expand Up @@ -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)
tp->fackets_out = fack_count;

if (after(TCP_SKB_CB(skb)->seq,
tp->highest_sack))
tp->highest_sack = TCP_SKB_CB(skb)->seq;
} else {
if (dup_sack && (sacked&TCPCB_RETRANS))
reord = min(fack_count, reord);
Expand Down

0 comments on commit d738cd8

Please sign in to comment.