Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61f0eb07 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

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: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19cd1592

include/net/sctp/constants.h

+2 −4
Original line number Diff line number Diff line
@@ -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.

include/net/sctp/sm.h

+5 −7
Original line number Diff line number Diff line
@@ -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);

net/sctp/primitive.c

+1 −1
Original line number Diff line number Diff line
@@ -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; \

	\

net/sctp/sm_sideeffect.c

+9 −11
Original line number Diff line number Diff line
@@ -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 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype, 
 ********************************************************************/



/* 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,

net/sctp/sm_statetable.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{