diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-01 23:57:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-01 23:57:40 +0100 |
| commit | b4017c5368f992fb8fb3a2545a0977082c6664e4 (patch) | |
| tree | b18fee77164297141c988965a9846225f8d8b3d3 /include/net/tcp.h | |
| parent | be2net: Remove unused OFFSET_IN_PAGE() macro (diff) | |
| parent | enic: fix an endian bug in enic_probe() (diff) | |
| download | linux-b4017c5368f992fb8fb3a2545a0977082c6664e4.tar.xz linux-b4017c5368f992fb8fb3a2545a0977082c6664e4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/tg3.c
Conflicts in the statistics regression bug fix from 'net',
but happily Matt Carlson originally posted the fix against
'net-next' so I used that to resolve this.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 6b2acfce4cfd..8607e6aad42b 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1362,8 +1362,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) { |