diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 14:25:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 14:25:22 -0700 |
| commit | 1d8674edb534a3c5cb549bfde5a39fa5598cb3bc (patch) | |
| tree | 2fe4a39c0d4a26400d8b89e800ba596f1de88ec7 /include | |
| parent | d99901d6fdfb4098b9996de89ffbbae890e08288 (diff) | |
| parent | cb7b593c2c808b32a1ea188599713c434b95f849 (diff) | |
| download | kernel_samsung_aries-1d8674edb534a3c5cb549bfde5a39fa5598cb3bc.zip kernel_samsung_aries-1d8674edb534a3c5cb549bfde5a39fa5598cb3bc.tar.gz kernel_samsung_aries-1d8674edb534a3c5cb549bfde5a39fa5598cb3bc.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dccp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 007c290..8bf4bac 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h @@ -432,7 +432,10 @@ struct dccp_sock { struct ccid *dccps_hc_rx_ccid; struct ccid *dccps_hc_tx_ccid; struct dccp_options_received dccps_options_received; + struct timeval dccps_epoch; enum dccp_role dccps_role:2; + __u8 dccps_hc_rx_insert_options:1; + __u8 dccps_hc_tx_insert_options:1; }; static inline struct dccp_sock *dccp_sk(const struct sock *sk) |