sctp: remove the typedef sctp_event_t

This patch is to remove the typedef sctp_event_t, and
replace with enum sctp_event 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/constants.h b/include/net/sctp/constants.h
index fb931f07e83ad63ade7b8a404e66c2984ca7e91d..3181e0f95b60bec7ff7065c7cf6cd434741260a5 100644 (file)
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -71,14 +71,12 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM };
                                         SCTP_NUM_AUTH_CHUNK_TYPES)
 
 /* These are the different flavours of event.  */
-typedef enum {
-
+enum sctp_event {
        SCTP_EVENT_T_CHUNK = 1,
        SCTP_EVENT_T_TIMEOUT,
        SCTP_EVENT_T_OTHER,
        SCTP_EVENT_T_PRIMITIVE
-
-} sctp_event_t;
+};
 
 /* As a convenience for the state machine, we append SCTP_EVENT_* and
  * SCTP_ULP_* to the list of possible chunks.

diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index 281e8d1e0752666962ab0a360e36abcf54e866d0..96f54cff796473853791afccc3cf25f48a0b8db0 100644 (file)
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -176,7 +176,7 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire;
 /* Prototypes for utility support functions.  */
 __u8 sctp_get_chunk_type(struct sctp_chunk *chunk);
 const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *net,
-                                                 sctp_event_t event_type,
+                                                 enum sctp_event event_type,
                                                  enum sctp_state state,
                                                  sctp_subtype_t event_subtype);
 int sctp_chunk_iif(const struct sctp_chunk *);
@@ -312,12 +312,10 @@ struct sctp_chunk *sctp_process_strreset_resp(
 
 /* Prototypes for statetable processing. */
 
-int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,
-              enum sctp_state state,
-               struct sctp_endpoint *,
-               struct sctp_association *asoc,
-               void *event_arg,
-              gfp_t gfp);
+int sctp_do_sm(struct net *net, enum sctp_event event_type,
+              sctp_subtype_t subtype, enum sctp_state state,
+              struct sctp_endpoint *ep, struct sctp_association *asoc,
+              void *event_arg, gfp_t gfp);
 
 /* 2nd level prototypes */
 void sctp_generate_t3_rtx_event(unsigned long peer);

diff --git a/net/sctp/primitive.c b/net/sctp/primitive.c
index 1fb5b9bb3c6d9ccfc9b0494b290a1af960d3472a..c914166984b3d1f63428f1412ed6aa95412f212a 100644 (file)
--- a/net/sctp/primitive.c
+++ b/net/sctp/primitive.c
@@ -53,7 +53,7 @@
 int sctp_primitive_ ## name(struct net *net, struct sctp_association *asoc, \
                            void *arg) { \
        int error = 0; \
-       sctp_event_t event_type; sctp_subtype_t subtype; \
+       enum sctp_event event_type; sctp_subtype_t subtype; \
        enum sctp_state state; \
        struct sctp_endpoint *ep; \
        \

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 11a344896b7183fab5e53fffc27f344b289e27fd..b545c768cb9e649b67bde5a0cdb7d39ec71348c1 100644 (file)
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -51,7 +51,7 @@
 #include <net/sctp/sctp.h>
 #include <net/sctp/sm.h>
 
-static int sctp_cmd_interpreter(sctp_event_t event_type,
+static int sctp_cmd_interpreter(enum sctp_event event_type,
                                sctp_subtype_t subtype,
                                enum sctp_state state,
                                struct sctp_endpoint *ep,
@@ -60,7 +60,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                                sctp_disposition_t status,
                                sctp_cmd_seq_t *commands,
                                gfp_t gfp);
-static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
+static int sctp_side_effects(enum sctp_event event_type, sctp_subtype_t subtype,
                             enum sctp_state state,
                             struct sctp_endpoint *ep,
                             struct sctp_association **asoc,
@@ -602,7 +602,7 @@ static void sctp_cmd_init_failed(sctp_cmd_seq_t *commands,
 /* Worker routine to handle SCTP_CMD_ASSOC_FAILED.  */
 static void sctp_cmd_assoc_failed(sctp_cmd_seq_t *commands,
                                  struct sctp_association *asoc,
-                                 sctp_event_t event_type,
+                                 enum sctp_event event_type,
                                  sctp_subtype_t subtype,
                                  struct sctp_chunk *chunk,
                                  unsigned int error)
@@ -1139,12 +1139,10 @@ static void sctp_cmd_send_asconf(struct sctp_association *asoc)
  * If you want to understand all of lksctp, this is a
  * good place to start.
  */
-int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,
-              enum sctp_state state,
-              struct sctp_endpoint *ep,
-              struct sctp_association *asoc,
-              void *event_arg,
-              gfp_t gfp)
+int sctp_do_sm(struct net *net, enum sctp_event event_type,
+              sctp_subtype_t subtype, enum sctp_state state,
+              struct sctp_endpoint *ep, struct sctp_association *asoc,
+              void *event_arg, gfp_t gfp)
 {
        sctp_cmd_seq_t commands;
        const sctp_sm_table_entry_t *state_fn;
@@ -1178,7 +1176,7 @@ int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,
 /*****************************************************************
  * This the master state function side effect processing function.
  *****************************************************************/
-static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
+static int sctp_side_effects(enum sctp_event event_type, sctp_subtype_t subtype,
                             enum sctp_state state,
                             struct sctp_endpoint *ep,
                             struct sctp_association **asoc,
@@ -1263,7 +1261,7 @@ bail:
  ********************************************************************/
 
 /* This is the side-effect interpreter.  */
-static int sctp_cmd_interpreter(sctp_event_t event_type,
+static int sctp_cmd_interpreter(enum sctp_event event_type,
                                sctp_subtype_t subtype,
                                enum sctp_state state,
                                struct sctp_endpoint *ep,

diff --git a/net/sctp/sm_statetable.c b/net/sctp/sm_statetable.c
index f46c11bffea7611845cc493f4c92483f03827627..f7cdb7014244e359332b3ca47b66a8173d09df8e 100644 (file)
--- a/net/sctp/sm_statetable.c
+++ b/net/sctp/sm_statetable.c
@@ -78,7 +78,7 @@ static const sctp_sm_table_entry_t bug = {
 })
 
 const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *net,
-                                                 sctp_event_t event_type,
+                                                 enum sctp_event event_type,
                                                  enum sctp_state state,
                                                  sctp_subtype_t event_subtype)
 {