1 files changed, 8 insertions, 24 deletions

diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index 63908840eef0..942b864f6135 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -61,7 +61,6 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM };
  * symbols.  CIDs are dense through SCTP_CID_BASE_MAX.
  */
 #define SCTP_CID_BASE_MAX               SCTP_CID_SHUTDOWN_COMPLETE
-#define SCTP_CID_MAX                    SCTP_CID_ASCONF_ACK
 
 #define SCTP_NUM_BASE_CHUNK_TYPES       (SCTP_CID_BASE_MAX + 1)
 
@@ -86,9 +85,6 @@ typedef enum {
 
 } sctp_event_t;
 
-#define SCTP_EVENT_T_MAX SCTP_EVENT_T_PRIMITIVE
-#define SCTP_EVENT_T_NUM (SCTP_EVENT_T_MAX + 1)
-
 /* As a convenience for the state machine, we append SCTP_EVENT_* and
  * SCTP_ULP_* to the list of possible chunks.
  */
@@ -154,7 +150,6 @@ SCTP_SUBTYPE_CONSTRUCTOR(OTHER,		sctp_event_other_t,	other)
 SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE,     sctp_event_primitive_t, primitive)
 
 
-#define sctp_chunk_is_control(a) (a->chunk_hdr->type != SCTP_CID_DATA)
 #define sctp_chunk_is_data(a) (a->chunk_hdr->type == SCTP_CID_DATA)
 
 /* Calculate the actual data size in a data chunk */
@@ -162,9 +157,6 @@ SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE,	sctp_event_primitive_t,	primitive)
                                 - (unsigned long)(c->chunk_hdr)\
                                 - sizeof(sctp_data_chunk_t)))
 
-#define SCTP_MAX_ERROR_CAUSE  SCTP_ERROR_NONEXIST_IP
-#define SCTP_NUM_ERROR_CAUSE  10
-
 /* Internal error codes */
 typedef enum {
 
@@ -195,15 +187,14 @@ typedef enum {
 /* SCTP state defines for internal state machine */
 typedef enum {
 
-        SCTP_STATE_EMPTY                = 0,
-        SCTP_STATE_CLOSED               = 1,
-        SCTP_STATE_COOKIE_WAIT          = 2,
-        SCTP_STATE_COOKIE_ECHOED        = 3,
-        SCTP_STATE_ESTABLISHED          = 4,
-        SCTP_STATE_SHUTDOWN_PENDING     = 5,
-        SCTP_STATE_SHUTDOWN_SENT        = 6,
-        SCTP_STATE_SHUTDOWN_RECEIVED    = 7,
-        SCTP_STATE_SHUTDOWN_ACK_SENT    = 8,
+        SCTP_STATE_CLOSED               = 0,
+        SCTP_STATE_COOKIE_WAIT          = 1,
+        SCTP_STATE_COOKIE_ECHOED        = 2,
+        SCTP_STATE_ESTABLISHED          = 3,
+        SCTP_STATE_SHUTDOWN_PENDING     = 4,
+        SCTP_STATE_SHUTDOWN_SENT        = 5,
+        SCTP_STATE_SHUTDOWN_RECEIVED    = 6,
+        SCTP_STATE_SHUTDOWN_ACK_SENT    = 7,
 
 } sctp_state_t;
 
@@ -266,7 +257,6 @@ enum { SCTP_ARBITRARY_COOKIE_ECHO_LEN = 200 };
 #define SCTP_TSN_MAP_INITIAL BITS_PER_LONG
 #define SCTP_TSN_MAP_INCREMENT SCTP_TSN_MAP_INITIAL
 #define SCTP_TSN_MAP_SIZE 4096
-#define SCTP_TSN_MAX_GAP  65535
 
 /* We will not record more than this many duplicate TSNs between two
  * SACKs.  The minimum PMTU is 576.  Remove all the headers and there
@@ -301,9 +291,6 @@ enum { SCTP_MAX_GABS = 16 };
 
 #define SCTP_CLOCK_GRANULARITY  1       /* 1 jiffy */
 
-#define SCTP_DEF_MAX_INIT 6
-#define SCTP_DEF_MAX_SEND 10
-
 #define SCTP_DEFAULT_COOKIE_LIFE        (60 * 1000) /* 60 seconds */
 
 #define SCTP_DEFAULT_MINWINDOW  1500    /* default minimum rwnd size */
@@ -317,9 +304,6 @@ enum { SCTP_MAX_GABS = 16 };
                                          */
 #define SCTP_DEFAULT_MINSEGMENT 512     /* MTU size ... if no mtu disc */
 #define SCTP_HOW_MANY_SECRETS 2         /* How many secrets I keep */
-#define SCTP_HOW_LONG_COOKIE_LIVE 3600  /* How many seconds the current
-                                         * secret will live?
-                                         */
 #define SCTP_SECRET_SIZE 32             /* Number of octets in a 256 bits. */
 
 #define SCTP_SIGNATURE_SIZE 20          /* size of a SLA-1 signature */