summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIan McDonald <imcdnzl@gmail.com>2006-03-21 02:56:56 +0100
committerDavid S. Miller <davem@davemloft.net>2006-03-21 02:56:56 +0100
commitba66c6e8b292997467128506f39fa6607e959050 (patch)
treed9c467ac7017b21b793442376080107b155c2afd /include
parent[NETFILTER] nf_conntrack: clean up to reduce size of 'struct nf_conn' (diff)
downloadlinux-ba66c6e8b292997467128506f39fa6607e959050.tar.xz
linux-ba66c6e8b292997467128506f39fa6607e959050.zip
[DCCP]: Set the default CCID according to kernel config selection
Now CCID2 is the default, as stated in the RFC drafts, but we allow a config where just CCID3 is built, where CCID3 becomes the default. Signed-off-by: Ian McDonald <imcdnzl@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/dccp.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index f91c8a62406d..a70d1a27e7fc 100644
--- a/include/linux/dccp.h
+++ b/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