diff options
author | Andrea Bittau <a.bittau@cs.ucl.ac.uk> | 2006-03-20 17:41:47 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-20 17:41:47 -0800 |
commit | 2a91aa3967398fb94eccc8da67c82bce9f67afdf (patch) | |
tree | 62bf003487121bc629919c85810df11e52016b8f /include | |
parent | aa5d7df3b20e0e493e90e1151510ab3ae8366bb5 (diff) | |
download | linux-stable-2a91aa3967398fb94eccc8da67c82bce9f67afdf.tar.gz linux-stable-2a91aa3967398fb94eccc8da67c82bce9f67afdf.tar.bz2 linux-stable-2a91aa3967398fb94eccc8da67c82bce9f67afdf.zip |
[DCCP] CCID2: Initial CCID2 (TCP-Like) implementation
Original work by Andrea Bittau, Arnaldo Melo cleaned up and fixed several
issues on the merge process.
For now CCID2 was turned the default for all SOCK_DCCP connections, but this
will be remedied soon with the merge of the feature negotiation code.
Signed-off-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/dccp.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 088529f54965..268b4579d7e5 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h @@ -314,9 +314,9 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) /* initial values for each feature */ #define DCCPF_INITIAL_SEQUENCE_WINDOW 100 -/* FIXME: for now we're using CCID 3 (TFRC) */ -#define DCCPF_INITIAL_CCID 3 -#define DCCPF_INITIAL_SEND_ACK_VECTOR 0 +/* FIXME: for now we're using CCID 2 (TCP-Like) */ +#define DCCPF_INITIAL_CCID 2 +#define DCCPF_INITIAL_SEND_ACK_VECTOR 1 /* FIXME: for now we're default to 1 but it should really be 0 */ #define DCCPF_INITIAL_SEND_NDP_COUNT 1 @@ -430,6 +430,8 @@ struct dccp_sock { struct timeval dccps_timestamp_time; __u32 dccps_timestamp_echo; __u32 dccps_packet_size; + __u16 dccps_l_ack_ratio; + __u16 dccps_r_ack_ratio; unsigned long dccps_ndp_count; __u32 dccps_mss_cache; struct dccp_options dccps_options; |