diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 01:01:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 01:01:33 -0400 |
| commit | 9eed28679282238210ad5e80bb91df30fec6d7db (patch) | |
| tree | e94e88cb57861c7820371fc8038f87c3631ee178 /net/dccp/ackvec.h | |
| parent | 2099c99e3b24f86b131566aa9854249189ae9ea2 (diff) | |
| parent | 0e64e94e477f8ed04e9295b11a5898d443c28a47 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DCCP]: Update documentation references.
[ATM] horizon: read_bia() needs to be __devinit
[NETFILTER]: Fix ip6_tables extension header bypass bug
[NETFILTER]: Fix ip6_tables protocol bypass bug
[XFRM]: Fix xfrm_state accounting
[IPV4] ipconfig: fix RARP ic_servaddr breakage
Diffstat (limited to 'net/dccp/ackvec.h')
| -rw-r--r-- | net/dccp/ackvec.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h index 2424effac7f6..cf8f20ce23a9 100644 --- a/net/dccp/ackvec.h +++ b/net/dccp/ackvec.h | |||
| @@ -28,8 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | /** struct dccp_ackvec - ack vector | 29 | /** struct dccp_ackvec - ack vector |
| 30 | * | 30 | * |
| 31 | * This data structure is the one defined in the DCCP draft | 31 | * This data structure is the one defined in RFC 4340, Appendix A. |
| 32 | * Appendix A. | ||
| 33 | * | 32 | * |
| 34 | * @dccpav_buf_head - circular buffer head | 33 | * @dccpav_buf_head - circular buffer head |
| 35 | * @dccpav_buf_tail - circular buffer tail | 34 | * @dccpav_buf_tail - circular buffer tail |