sctp: remove the typedef sctp_event_timeout_t

This patch is to remove the typedef sctp_event_timeout_t, and
replace with enum sctp_event_timeout in the places where it's
using this typedef.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index be12ec9..376cb78 100644 (file)
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -127,7 +127,7 @@ typedef union {
        int error;
        __be16 err;
        enum sctp_state state;
-       sctp_event_timeout_t to;
+       enum sctp_event_timeout to;
        struct sctp_chunk *chunk;
        struct sctp_association *asoc;
        struct sctp_transport *transport;
@@ -168,7 +168,7 @@ SCTP_ARG_CONSTRUCTOR(U8,    __u8, u8)
 SCTP_ARG_CONSTRUCTOR(ERROR,     int, error)
 SCTP_ARG_CONSTRUCTOR(PERR,      __be16, err)   /* protocol error */
 SCTP_ARG_CONSTRUCTOR(STATE,    enum sctp_state, state)
-SCTP_ARG_CONSTRUCTOR(TO,       sctp_event_timeout_t, to)
+SCTP_ARG_CONSTRUCTOR(TO,       enum sctp_event_timeout, to)
 SCTP_ARG_CONSTRUCTOR(CHUNK,    struct sctp_chunk *, chunk)
 SCTP_ARG_CONSTRUCTOR(ASOC,     struct sctp_association *, asoc)
 SCTP_ARG_CONSTRUCTOR(TRANSPORT,        struct sctp_transport *, transport)

diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index fd8a80e..fb931f0 100644 (file)
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -84,7 +84,7 @@ typedef enum {
  * SCTP_ULP_* to the list of possible chunks.
  */
 
-typedef enum {
+enum sctp_event_timeout {
        SCTP_EVENT_TIMEOUT_NONE = 0,
        SCTP_EVENT_TIMEOUT_T1_COOKIE,
        SCTP_EVENT_TIMEOUT_T1_INIT,
@@ -96,7 +96,7 @@ typedef enum {
        SCTP_EVENT_TIMEOUT_RECONF,
        SCTP_EVENT_TIMEOUT_SACK,
        SCTP_EVENT_TIMEOUT_AUTOCLOSE,
-} sctp_event_timeout_t;
+};
 
 #define SCTP_EVENT_TIMEOUT_MAX         SCTP_EVENT_TIMEOUT_AUTOCLOSE
 #define SCTP_NUM_TIMEOUT_TYPES         (SCTP_EVENT_TIMEOUT_MAX + 1)
@@ -131,7 +131,7 @@ enum sctp_event_primitive {
 
 typedef union {
        enum sctp_cid chunk;
-       sctp_event_timeout_t timeout;
+       enum sctp_event_timeout timeout;
        enum sctp_event_other other;
        enum sctp_event_primitive primitive;
 } sctp_subtype_t;
@@ -142,7 +142,7 @@ SCTP_ST_## _name (_type _arg)               \
 { sctp_subtype_t _retval; _retval._elt = _arg; return _retval; }
 
 SCTP_SUBTYPE_CONSTRUCTOR(CHUNK,                enum sctp_cid,          chunk)
-SCTP_SUBTYPE_CONSTRUCTOR(TIMEOUT,      sctp_event_timeout_t,   timeout)
+SCTP_SUBTYPE_CONSTRUCTOR(TIMEOUT,      enum sctp_event_timeout, timeout)
 SCTP_SUBTYPE_CONSTRUCTOR(OTHER,                enum sctp_event_other,  other)
 SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE,    enum sctp_event_primitive, primitive)
 

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index b77a81a..11a3448 100644 (file)
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -280,7 +280,7 @@ out_unlock:
  * for timeouts which use the association as their parameter.
  */
 static void sctp_generate_timeout_event(struct sctp_association *asoc,
-                                       sctp_event_timeout_t timeout_type)
+                                       enum sctp_event_timeout timeout_type)
 {
        struct sock *sk = asoc->base.sk;
        struct net *net = sock_net(sk);
@@ -1052,8 +1052,8 @@ static void sctp_cmd_adaptation_ind(sctp_cmd_seq_t *commands,
 
 
 static void sctp_cmd_t1_timer_update(struct sctp_association *asoc,
-                                   sctp_event_timeout_t timer,
-                                   char *name)
+                                    enum sctp_event_timeout timer,
+                                    char *name)
 {
        struct sctp_transport *t;