Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

git-mirror · Sep 9, 2005 · 8259f16 · 8259f16
2 parents 5dce225 + 59725dc
commit 8259f16
Show file tree

Hide file tree

Showing 9 changed files with 172 additions and 123 deletions.
diff --git 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)