diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:26:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 11:26:52 -0400 |
| commit | 47258cf3c4aa5d56e678bafe0dd0d03ddd980b88 (patch) | |
| tree | 4856f0fb1185ba97f320a7ed6fb63bf136708a42 /include/net/tcp.h | |
| parent | c308b56b5398779cd3da0f62ab26b0453494c3d4 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
Merge tag 'v3.3-rc7' into sched/core
Merge reason: merge back final fixes, prepare for the merge window.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 42c29bfbcee3..2d80c291fffb 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -1364,8 +1364,9 @@ static inline void tcp_push_pending_frames(struct sock *sk) | |||
| 1364 | } | 1364 | } |
| 1365 | } | 1365 | } |
| 1366 | 1366 | ||
| 1367 | /* Start sequence of the highest skb with SACKed bit, valid only if | 1367 | /* Start sequence of the skb just after the highest skb with SACKed |
| 1368 | * sacked > 0 or when the caller has ensured validity by itself. | 1368 | * bit, valid only if sacked_out > 0 or when the caller has ensured |
| 1369 | * validity by itself. | ||
| 1369 | */ | 1370 | */ |
| 1370 | static inline u32 tcp_highest_sack_seq(struct tcp_sock *tp) | 1371 | static inline u32 tcp_highest_sack_seq(struct tcp_sock *tp) |
| 1371 | { | 1372 | { |