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

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

sctp: remove the typedef sctp_state_t 



This patch is to remove the typedef sctp_state_t, and
replace with enum sctp_state 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 4785c7ae

include/net/sctp/command.h

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ typedef union { 
	__u8 u8;

	int error;

	__be16 err;

	sctp_state_t state;

	enum sctp_state state;

	sctp_event_timeout_t to;

	struct sctp_chunk *chunk;

	struct sctp_association *asoc;
@@ -167,7 +167,7 @@ SCTP_ARG_CONSTRUCTOR(U16, __u16, u16) 
SCTP_ARG_CONSTRUCTOR(U8,	__u8, u8)

SCTP_ARG_CONSTRUCTOR(ERROR,     int, error)

SCTP_ARG_CONSTRUCTOR(PERR,      __be16, err)	/* protocol error */

SCTP_ARG_CONSTRUCTOR(STATE,	sctp_state_t, state)

SCTP_ARG_CONSTRUCTOR(STATE,	enum sctp_state, state)

SCTP_ARG_CONSTRUCTOR(TO,	sctp_event_timeout_t, to)

SCTP_ARG_CONSTRUCTOR(CHUNK,	struct sctp_chunk *, chunk)

SCTP_ARG_CONSTRUCTOR(ASOC,	struct sctp_association *, asoc)

include/net/sctp/constants.h

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ enum sctp_ierror { 




/* SCTP state defines for internal state machine */

typedef enum {

enum sctp_state {



	SCTP_STATE_CLOSED		= 0,

	SCTP_STATE_COOKIE_WAIT		= 1,
@@ -192,7 +192,7 @@ typedef enum { 
	SCTP_STATE_SHUTDOWN_RECEIVED	= 6,

	SCTP_STATE_SHUTDOWN_ACK_SENT	= 7,



} sctp_state_t;

};



#define SCTP_STATE_MAX			SCTP_STATE_SHUTDOWN_ACK_SENT

#define SCTP_STATE_NUM_STATES		(SCTP_STATE_MAX + 1)

include/net/sctp/sctp.h

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static inline int __sctp_style(const struct sock *sk, sctp_socket_type_t style) 
/* Is the association in this state? */

#define sctp_state(asoc, state) __sctp_state((asoc), (SCTP_STATE_##state))

static inline int __sctp_state(const struct sctp_association *asoc,

			       sctp_state_t state)

			       enum sctp_state state)

{

	return asoc->state == state;

}

include/net/sctp/sm.h

+5 −5
Original line number Diff line number Diff line
@@ -175,10 +175,10 @@ 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 *,

					    sctp_event_t,

					    sctp_state_t,

					    sctp_subtype_t);

const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *net,

						  sctp_event_t event_type,

						  enum sctp_state state,

						  sctp_subtype_t event_subtype);

int sctp_chunk_iif(const struct sctp_chunk *);

struct sctp_association *sctp_make_temp_asoc(const struct sctp_endpoint *,

					     struct sctp_chunk *,
@@ -313,7 +313,7 @@ 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,

	       sctp_state_t state,

	       enum sctp_state state,

               struct sctp_endpoint *,

               struct sctp_association *asoc,

               void *event_arg,

include/net/sctp/structs.h

+1 −1
Original line number Diff line number Diff line
@@ -1577,7 +1577,7 @@ struct sctp_association { 
	 *

	 *		State takes values from SCTP_STATE_*.

	 */

	sctp_state_t state;

	enum sctp_state state;



	/* Overall     : The overall association error count.

	 * Error Count : [Clear this any time I get something.]