Index: include/linux/dccp.h
===================================================================
--- include/linux/dccp.h.orig	2005-05-05 16:39:30.000000000 -0300
+++ include/linux/dccp.h	2005-05-05 16:39:31.000000000 -0300
@@ -369,23 +369,6 @@
 #define DCCPF_INITIAL_MIN_CRC_COVERAGE		0
 #define DCCPF_INITIAL_CHECK_DATA		0
 
-/* reconciliation rules */
-enum dccp_reconciliation_rules {
-	DCCPF_RECON_SP,		/* Server Priority */
-	DCCPF_RECON_NN,		/* Non Negotiable */
-};
-
-/* reconciliation rules used by each feature */
-#define DCCPF_RECONR_SEQUENCE_WINDOW		DCCPF_RECON_SP
-#define DCCPF_RECONR_ACK_RATIO			DCCPF_RECON_SP
-#define DCCPF_RECONR_CCID			DCCPF_RECON_NN
-#define DCCPF_RECONR_ALLOW_SHORT_SEQNOS		DCCPF_RECON_SP
-#define DCCPF_RECONR_ECN_INCAPABLE		DCCPF_RECON_NN
-#define DCCPF_RECONR_SEND_ACK_VECTOR		DCCPF_RECON_SP
-#define DCCPF_RECONR_SEND_NDP_COUNT		DCCPF_RECON_SP
-#define DCCPF_RECONR_MIN_CRC_COVERAGE		DCCPF_RECON_SP
-#define DCCPF_RECONR_CHECK_DATA			DCCPF_RECON_SP
-
 /* possible states during negotiation */
 enum dccp_feature_state {
 	DCCPF_STATE_STABLE = 0,