From 493d481c998d3d1f301ee1cbd64ac285997e0833 Mon Sep 17 00:00:00 2001
From: Ian McDonald <ian.mcdonald@jandi.co.nz>
Date: Fri, 22 Sep 2006 14:25:36 +1200
Subject: [PATCH] --- yaml --- r: 35541 b: refs/heads/master c:
 b83eff641ed39bd631535b9a8971e161b056f541 h: refs/heads/master i:   35539:
 f91a0305c46ca338e529947b0fce53404cadba9b v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/dccp.h | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1f025ce58175..8e17bf4d34d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00e4d116a7ef94eb910be037912b0b2fc09f608b
+refs/heads/master: b83eff641ed39bd631535b9a8971e161b056f541
diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h
index 29f9291e45c0..d6f4ec467a4b 100644
--- a/trunk/include/linux/dccp.h
+++ b/trunk/include/linux/dccp.h
@@ -169,6 +169,12 @@ enum {
 	DCCPO_MAX_CCID_SPECIFIC = 255,
 };
 
+/* DCCP CCIDS */
+enum {
+	DCCPC_CCID2 = 2,
+	DCCPC_CCID3 = 3,
+};
+
 /* DCCP features */
 enum {
 	DCCPF_RESERVED = 0,
@@ -320,7 +326,7 @@ 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
-#define DCCPF_INITIAL_CCID			2
+#define DCCPF_INITIAL_CCID			DCCPC_CCID2
 #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