sctp: remove the typedef sctp_verb_t

This patch is to remove the typedef sctp_verb_t, and
replace with enum sctp_verb 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 f5fc425b5a4f6ebc4249a96b9cf0d23ca0251597..b55c6a48a20696328e918155d310132160f87f64 100644 (file)
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -40,7 +40,7 @@
 #include <net/sctp/structs.h>
 
 
-typedef enum {
+enum sctp_verb {
        SCTP_CMD_NOP = 0,       /* Do nothing. */
        SCTP_CMD_NEW_ASOC,      /* Register a new association.  */
        SCTP_CMD_DELETE_TCB,    /* Delete the current association. */
@@ -108,7 +108,7 @@ typedef enum {
        SCTP_CMD_PURGE_ASCONF_QUEUE, /* Purge all asconf queues.*/
        SCTP_CMD_SET_ASOC,       /* Restore association context */
        SCTP_CMD_LAST
-} sctp_verb_t;
+};
 
 /* How many commands can you put in an struct sctp_cmd_seq?
  * This is a rather arbitrary number, ideally derived from a careful
@@ -198,7 +198,7 @@ static inline union sctp_arg SCTP_NULL(void)
 
 struct sctp_cmd {
        union sctp_arg obj;
-       sctp_verb_t verb;
+       enum sctp_verb verb;
 };
 
 struct sctp_cmd_seq {
@@ -225,8 +225,8 @@ static inline int sctp_init_cmd_seq(struct sctp_cmd_seq *seq)
  * Use the SCTP_* constructors defined by SCTP_ARG_CONSTRUCTOR() above
  * to wrap data which goes in the obj argument.
  */
-static inline void sctp_add_cmd_sf(struct sctp_cmd_seq *seq, sctp_verb_t verb,
-                                  union sctp_arg obj)
+static inline void sctp_add_cmd_sf(struct sctp_cmd_seq *seq,
+                                  enum sctp_verb verb, union sctp_arg obj)
 {
        struct sctp_cmd *cmd = seq->last_used_slot - 1;
 

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 3394c4d34ea47227ebbc1da23f70160a8e9dd5af..adc1dde34bfea044a3bb23f8afb9bb1838d7bd7c 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -6205,7 +6205,7 @@ static int sctp_eat_data(const struct sctp_association *asoc,
        struct sctp_datahdr *data_hdr;
        struct sctp_chunk *err;
        size_t datalen;
-       sctp_verb_t deliver;
+       enum sctp_verb deliver;
        int tmp;
        __u32 tsn;
        struct sctp_tsnmap *map = (struct sctp_tsnmap *)&asoc->peer.tsn_map;