summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-09-09 13:17:43 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-09-09 13:17:43 -0700
commit8259f1625789ad03e6451ecef3e690af52e8e802 (patch)
tree079dd05df0542d98074a27c9a358dc8f0735c23b /include/linux
parent5dce225bd9ea60e28e17076de63df0dee51b2883 (diff)
parent59725dc2a2e86a03bbf97976ede3bdc6f95bba92 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dccp.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 007c290f74d..8bf4bacb505 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)