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

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

sctp: remove the typedef sctp_subtype_t 



This patch is to remove the typedef sctp_subtype_t, and
replace with union sctp_subtype in the places where it's
using this typedef.

Note that it doesn't fix many indents although it should,
as sctp_disposition_t's removal would mess them up again.
So better to fix them when removing sctp_disposition_t in
later patch.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61f0eb07

include/net/sctp/constants.h

+9 −9
Original line number Diff line number Diff line
@@ -124,20 +124,20 @@ enum sctp_event_primitive { 
/* We define here a utility type for manipulating subtypes.

 * The subtype constructors all work like this:

 *

 * 	sctp_subtype_t foo = SCTP_ST_CHUNK(SCTP_CID_INIT);

 *   union sctp_subtype foo = SCTP_ST_CHUNK(SCTP_CID_INIT);

 */



typedef union {

union sctp_subtype {

	enum sctp_cid chunk;

	enum sctp_event_timeout timeout;

	enum sctp_event_other other;

	enum sctp_event_primitive primitive;

} sctp_subtype_t;

};



#define SCTP_SUBTYPE_CONSTRUCTOR(_name, _type, _elt) \

static inline sctp_subtype_t	\

static inline union sctp_subtype	\

SCTP_ST_## _name (_type _arg)		\

{ sctp_subtype_t _retval; _retval._elt = _arg; return _retval; }

{ union sctp_subtype _retval; _retval._elt = _arg; return _retval; }



SCTP_SUBTYPE_CONSTRUCTOR(CHUNK,		enum sctp_cid,		chunk)

SCTP_SUBTYPE_CONSTRUCTOR(TIMEOUT,	enum sctp_event_timeout, timeout)
@@ -220,10 +220,10 @@ enum sctp_sock_state { 
};



/* These functions map various type to printable names.  */

const char *sctp_cname(const sctp_subtype_t);	/* chunk types */

const char *sctp_oname(const sctp_subtype_t);	/* other events */

const char *sctp_tname(const sctp_subtype_t);	/* timeouts */

const char *sctp_pname(const sctp_subtype_t);	/* primitives */

const char *sctp_cname(const union sctp_subtype id);	/* chunk types */

const char *sctp_oname(const union sctp_subtype id);	/* other events */

const char *sctp_tname(const union sctp_subtype id);	/* timeouts */

const char *sctp_pname(const union sctp_subtype id);	/* primitives */



/* This is a table of printable names of sctp_state_t's.  */

extern const char *const sctp_state_tbl[];

include/net/sctp/sm.h

+7 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ typedef struct { 
typedef sctp_disposition_t (sctp_state_fn_t) (struct net *,

					      const struct sctp_endpoint *,

					      const struct sctp_association *,

					      const sctp_subtype_t type,

					      const union sctp_subtype type,

					      void *arg,

					      sctp_cmd_seq_t *);

typedef void (sctp_timer_event_t) (unsigned long);
@@ -175,10 +175,11 @@ 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,

const sctp_sm_table_entry_t *sctp_sm_lookup_event(

					struct net *net,

					enum sctp_event event_type,

					enum sctp_state state,

						  sctp_subtype_t event_subtype);

					union sctp_subtype 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 +314,7 @@ struct sctp_chunk *sctp_process_strreset_resp( 
/* Prototypes for statetable processing. */



int sctp_do_sm(struct net *net, enum sctp_event event_type,

	       sctp_subtype_t subtype, enum sctp_state state,

	       union sctp_subtype subtype, enum sctp_state state,

	       struct sctp_endpoint *ep, struct sctp_association *asoc,

	       void *event_arg, gfp_t gfp);

net/sctp/associola.c

+1 −1
Original line number Diff line number Diff line
@@ -1021,11 +1021,11 @@ static void sctp_assoc_bh_rcv(struct work_struct *work) 
		container_of(work, struct sctp_association,

			     base.inqueue.immediate);

	struct net *net = sock_net(asoc->base.sk);

	union sctp_subtype subtype;

	struct sctp_endpoint *ep;

	struct sctp_chunk *chunk;

	struct sctp_inq *inqueue;

	int state;

	sctp_subtype_t subtype;

	int error = 0;



	/* The association should be held so we should be safe. */

net/sctp/debug.c

+4 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static const char *const sctp_cid_tbl[SCTP_NUM_BASE_CHUNK_TYPES] = { 
};



/* Lookup "chunk type" debug name. */

const char *sctp_cname(const sctp_subtype_t cid)

const char *sctp_cname(const union sctp_subtype cid)

{

	if (cid.chunk <= SCTP_CID_BASE_MAX)

		return sctp_cid_tbl[cid.chunk];
@@ -130,7 +130,7 @@ static const char *const sctp_primitive_tbl[SCTP_NUM_PRIMITIVE_TYPES] = { 
};



/* Lookup primitive debug name. */

const char *sctp_pname(const sctp_subtype_t id)

const char *sctp_pname(const union sctp_subtype id)

{

	if (id.primitive <= SCTP_EVENT_PRIMITIVE_MAX)

		return sctp_primitive_tbl[id.primitive];
@@ -143,7 +143,7 @@ static const char *const sctp_other_tbl[] = { 
};



/* Lookup "other" debug name. */

const char *sctp_oname(const sctp_subtype_t id)

const char *sctp_oname(const union sctp_subtype id)

{

	if (id.other <= SCTP_EVENT_OTHER_MAX)

		return sctp_other_tbl[id.other];
@@ -165,7 +165,7 @@ static const char *const sctp_timer_tbl[] = { 
};



/* Lookup timer debug name. */

const char *sctp_tname(const sctp_subtype_t id)

const char *sctp_tname(const union sctp_subtype id)

{

	BUILD_BUG_ON(SCTP_EVENT_TIMEOUT_MAX + 1 != ARRAY_SIZE(sctp_timer_tbl));

net/sctp/endpointola.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work) 
	struct sctp_transport *transport;

	struct sctp_chunk *chunk;

	struct sctp_inq *inqueue;

	sctp_subtype_t subtype;

	union sctp_subtype subtype;

	enum sctp_state state;

	int error = 0;

	int first_time = 1;	/* is this the first time through the loop */