diff --git a/[refs] b/[refs] index 89c602b0c155..9c700b80c11c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eea79e0713d94b02952f6c591b615710fd40a562 +refs/heads/master: ecb971923614775a118bc05ad16b2bde450cac7d diff --git a/trunk/include/linux/tcp.h b/trunk/include/linux/tcp.h index 46a85c9e1f25..3c7ffdb40dc6 100644 --- a/trunk/include/linux/tcp.h +++ b/trunk/include/linux/tcp.h @@ -412,7 +412,8 @@ struct tcp_sock { struct tcp_sack_block recv_sack_cache[4]; - struct sk_buff *highest_sack; /* highest skb with SACK received + struct sk_buff *highest_sack; /* skb just after the highest + * skb with SACKed bit set * (validity guaranteed only if * sacked_out > 0) */ diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h index 42c29bfbcee3..2d80c291fffb 100644 --- a/trunk/include/net/tcp.h +++ b/trunk/include/net/tcp.h @@ -1364,8 +1364,9 @@ static inline void tcp_push_pending_frames(struct sock *sk) } } -/* Start sequence of the highest skb with SACKed bit, valid only if - * sacked > 0 or when the caller has ensured validity by itself. +/* Start sequence of the skb just after the highest skb with SACKed + * bit, valid only if sacked_out > 0 or when the caller has ensured + * validity by itself. */ static inline u32 tcp_highest_sack_seq(struct tcp_sock *tp) {