From b0206b976cda8f900c1d63d3008a1ab9a06f6023 Mon Sep 17 00:00:00 2001 From: Ian McDonald Date: Mon, 20 Mar 2006 17:56:56 -0800 Subject: [PATCH] --- yaml --- r: 22163 b: refs/heads/master c: ba66c6e8b292997467128506f39fa6607e959050 h: refs/heads/master i: 22161: 5957f87085702b3b75879c8ad38817020a3513c9 22159: 8db344f1db0a3642ebe53792e462cab61afa7814 v: v3 --- [refs] | 2 +- trunk/include/linux/dccp.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2060aa2aab2b..0828666bc82e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc808fe28db59fadf4ec32d53f62477fa28f3be8 +refs/heads/master: ba66c6e8b292997467128506f39fa6607e959050 diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h index f91c8a62406d..a70d1a27e7fc 100644 --- a/trunk/include/linux/dccp.h +++ b/trunk/include/linux/dccp.h @@ -329,9 +329,18 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) /* initial values for each feature */ #define DCCPF_INITIAL_SEQUENCE_WINDOW 100 -#define DCCPF_INITIAL_CCID 2 #define DCCPF_INITIAL_ACK_RATIO 2 + +#if defined(CONFIG_IP_DCCP_CCID2) || defined(CONFIG_IP_DCCP_CCID2_MODULE) +#define DCCPF_INITIAL_CCID 2 #define DCCPF_INITIAL_SEND_ACK_VECTOR 1 +#elif defined(CONFIG_IP_DCCP_CCID3) || defined(CONFIG_IP_DCCP_CCID3_MODULE) +#define DCCPF_INITIAL_CCID 3 +#define DCCPF_INITIAL_SEND_ACK_VECTOR 0 +#else +#error "At least one CCID must be built as the default" +#endif + /* FIXME: for now we're default to 1 but it should really be 0 */ #define DCCPF_INITIAL_SEND_NDP_COUNT 1