TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
David S. Miller
2005-09-09 13:17:43 -07:00
parent 5dce225bd9 59725dc2a2
commit 8259f16257
9 changed files with 172 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/dccp.h
View File

@@ -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)