diff options
| author | David S. Miller | 2005-09-09 22:17:43 +0200 |
|---|---|---|
| committer | David S. Miller | 2005-09-09 22:17:43 +0200 |
| commit | 8259f1625789ad03e6451ecef3e690af52e8e802 (patch) | |
| tree | 079dd05df0542d98074a27c9a358dc8f0735c23b /include | |
| parent | [PATCH] Fix CONFIG_ACPI_BLACKLIST_YEAR (diff) | |
| parent | [CCID3] Introduce ccid3_hc_[rt]x_sk() for overal consistency (diff) | |
| download | kernel-qcow2-linux-8259f1625789ad03e6451ecef3e690af52e8e802.tar.gz kernel-qcow2-linux-8259f1625789ad03e6451ecef3e690af52e8e802.tar.xz kernel-qcow2-linux-8259f1625789ad03e6451ecef3e690af52e8e802.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/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 007c290f74d4..8bf4bacb5051 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) |