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

git-mirror · Sep 9, 2005 · 1d8674e · 1d8674e
2 parents d99901d + cb7b593
commit 1d8674e
Show file tree

Hide file tree

Showing 11 changed files with 557 additions and 555 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)