From e0d8b30aad4c33a37b4667c1acc03cd31ef55747 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 20 Mar 2006 19:23:58 -0800 Subject: [PATCH] --- yaml --- r: 22203 b: refs/heads/master c: 93ce20928f6e197707add8f670ae0cd029107e8f h: refs/heads/master i: 22201: db750ff889e1066c1cee292c05b89cc5f2f42488 22199: 944c37a6bf005d6a1c4bbb234d8c1cc3614ded8e v: v3 --- [refs] | 2 +- trunk/include/linux/dccp.h | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7c4e1b9f4600..3bfdf2ab83f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60fe62e789076ae7c13f7ffb35fec4b24802530d +refs/heads/master: 93ce20928f6e197707add8f670ae0cd029107e8f diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h index 496dbad8e896..e35f680f909b 100644 --- a/trunk/include/linux/dccp.h +++ b/trunk/include/linux/dccp.h @@ -320,17 +320,8 @@ 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_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