Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba66c6e8 authored by Ian McDonald's avatar Ian McDonald Committed by David S. Miller
Browse files

[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: default avatarIan McDonald <imcdnzl@gmail.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent dc808fe2
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -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