diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
| commit | 44e8ba93cf330f075178e31759100f367313790a (patch) | |
| tree | 27956beb159bfb603d672b43cb207690a087dd0a /include/linux/tcp.h | |
| parent | e9fe8a714e450b26f76eaf8832f5b9fe24d00e79 (diff) | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
Merge commit 'v3.3' into fbdev-next
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 46a85c9e1f25..3c7ffdb40dc6 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
| @@ -412,7 +412,8 @@ struct tcp_sock { | |||
| 412 | 412 | ||
| 413 | struct tcp_sack_block recv_sack_cache[4]; | 413 | struct tcp_sack_block recv_sack_cache[4]; |
| 414 | 414 | ||
| 415 | struct sk_buff *highest_sack; /* highest skb with SACK received | 415 | struct sk_buff *highest_sack; /* skb just after the highest |
| 416 | * skb with SACKed bit set | ||
| 416 | * (validity guaranteed only if | 417 | * (validity guaranteed only if |
| 417 | * sacked_out > 0) | 418 | * sacked_out > 0) |
| 418 | */ | 419 | */ |