diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-09-18 07:17:10 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-09-18 07:17:10 (GMT) |
| commit | 21f130a2370ba837cdfc5204ebe52e7c664fec3d (patch) | |
| tree | 7f8a30088d8d39eab9350c59b6638661309ffe89 /net/dccp/dccp.h | |
| parent | bc5e8fdfc622b03acf5ac974a1b8b26da6511c99 (diff) | |
| parent | c58ec93245a1fb7354f9e331960380827b9f41db (diff) | |
| download | linux-21f130a2370ba837cdfc5204ebe52e7c664fec3d.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/dccp/dccp.h')
| -rw-r--r-- | net/dccp/dccp.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 95c4630..be7a660 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h @@ -258,13 +258,12 @@ extern int dccp_v4_send_reset(struct sock *sk, extern void dccp_send_close(struct sock *sk, const int active); struct dccp_skb_cb { - __u8 dccpd_type; - __u8 dccpd_reset_code; - __u8 dccpd_service; - __u8 dccpd_ccval; + __u8 dccpd_type:4; + __u8 dccpd_ccval:4; + __u8 dccpd_reset_code; + __u16 dccpd_opt_len; __u64 dccpd_seq; __u64 dccpd_ack_seq; - int dccpd_opt_len; }; #define DCCP_SKB_CB(__skb) ((struct dccp_skb_cb *)&((__skb)->cb[0])) |