leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sctp: remove the typedef sctp_state_t

Browse Source 
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: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long
2017-08-05 19:59:59 +08:00
committed by David S. Miller
parent 4785c7ae18
commit 5210601945
9 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/sctp/command.h
View File

@@ -126,7 +126,7 @@ typedef union {
__u8 u8; __u8 u8;
int error; int error;
__be16 err; __be16 err;
sctp_state_t state; enum sctp_state state;
sctp_event_timeout_t to; sctp_event_timeout_t to;
struct sctp_chunk *chunk; struct sctp_chunk *chunk;
struct sctp_association *asoc; struct sctp_association *asoc;
@@ -167,7 +167,7 @@ SCTP_ARG_CONSTRUCTOR(U16, __u16, u16)
SCTP_ARG_CONSTRUCTOR(U8, __u8, u8) SCTP_ARG_CONSTRUCTOR(U8, __u8, u8)
SCTP_ARG_CONSTRUCTOR(ERROR, int, error) SCTP_ARG_CONSTRUCTOR(ERROR, int, error)
SCTP_ARG_CONSTRUCTOR(PERR, __be16, err) /* protocol 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(TO, sctp_event_timeout_t, to)
SCTP_ARG_CONSTRUCTOR(CHUNK, struct sctp_chunk *, chunk) SCTP_ARG_CONSTRUCTOR(CHUNK, struct sctp_chunk *, chunk)
SCTP_ARG_CONSTRUCTOR(ASOC, struct sctp_association *, asoc) SCTP_ARG_CONSTRUCTOR(ASOC, struct sctp_association *, asoc)

4
include/net/sctp/constants.h
View File

@@ -181,7 +181,7 @@ enum sctp_ierror {
/* SCTP state defines for internal state machine */ /* SCTP state defines for internal state machine */
typedef enum { enum sctp_state {
SCTP_STATE_CLOSED = 0, SCTP_STATE_CLOSED = 0,
SCTP_STATE_COOKIE_WAIT = 1, SCTP_STATE_COOKIE_WAIT = 1,
@@ -192,7 +192,7 @@ typedef enum {
SCTP_STATE_SHUTDOWN_RECEIVED = 6, SCTP_STATE_SHUTDOWN_RECEIVED = 6,
SCTP_STATE_SHUTDOWN_ACK_SENT = 7, SCTP_STATE_SHUTDOWN_ACK_SENT = 7,
} sctp_state_t; };
#define SCTP_STATE_MAX SCTP_STATE_SHUTDOWN_ACK_SENT #define SCTP_STATE_MAX SCTP_STATE_SHUTDOWN_ACK_SENT
#define SCTP_STATE_NUM_STATES (SCTP_STATE_MAX + 1) #define SCTP_STATE_NUM_STATES (SCTP_STATE_MAX + 1)

2
include/net/sctp/sctp.h
View File

@@ -558,7 +558,7 @@ static inline int __sctp_style(const struct sock *sk, sctp_socket_type_t style)
/* Is the association in this state? */ /* Is the association in this state? */
#define sctp_state(asoc, state) __sctp_state((asoc), (SCTP_STATE_##state)) #define sctp_state(asoc, state) __sctp_state((asoc), (SCTP_STATE_##state))
static inline int __sctp_state(const struct sctp_association *asoc, static inline int __sctp_state(const struct sctp_association *asoc,
sctp_state_t state) enum sctp_state state)
{ {
return asoc->state == state; return asoc->state == state;
} }

10
include/net/sctp/sm.h
View File

@@ -175,10 +175,10 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire;
/* Prototypes for utility support functions. */ /* Prototypes for utility support functions. */
__u8 sctp_get_chunk_type(struct sctp_chunk *chunk); __u8 sctp_get_chunk_type(struct sctp_chunk *chunk);
const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *, const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *net,
sctp_event_t, sctp_event_t event_type,
sctp_state_t, enum sctp_state state,
sctp_subtype_t); sctp_subtype_t event_subtype);
int sctp_chunk_iif(const struct sctp_chunk *); int sctp_chunk_iif(const struct sctp_chunk *);
struct sctp_association *sctp_make_temp_asoc(const struct sctp_endpoint *, struct sctp_association *sctp_make_temp_asoc(const struct sctp_endpoint *,
struct sctp_chunk *, struct sctp_chunk *,
@@ -313,7 +313,7 @@ struct sctp_chunk *sctp_process_strreset_resp(
/* Prototypes for statetable processing. */ /* Prototypes for statetable processing. */
int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype, 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_endpoint *,
struct sctp_association *asoc, struct sctp_association *asoc,
void *event_arg, void *event_arg,

2
include/net/sctp/structs.h
View File

@@ -1577,7 +1577,7 @@ struct sctp_association {
* *
* State takes values from SCTP_STATE_*. * State takes values from SCTP_STATE_*.
*/ */
sctp_state_t state; enum sctp_state state;
/* Overall : The overall association error count. /* Overall : The overall association error count.
* Error Count : [Clear this any time I get something.] * Error Count : [Clear this any time I get something.]

2
net/sctp/endpointola.c
View File

@@ -383,7 +383,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work)
struct sctp_chunk *chunk; struct sctp_chunk *chunk;
struct sctp_inq *inqueue; struct sctp_inq *inqueue;
sctp_subtype_t subtype; sctp_subtype_t subtype;
sctp_state_t state; enum sctp_state state;
int error = 0; int error = 0;
int first_time = 1; /* is this the first time through the loop */ int first_time = 1; /* is this the first time through the loop */

2
net/sctp/primitive.c
View File

@@ -54,7 +54,7 @@ int sctp_primitive_ ## name(struct net *net, struct sctp_association *asoc, \
void *arg) { \ void *arg) { \
int error = 0; \ int error = 0; \
sctp_event_t event_type; sctp_subtype_t subtype; \ sctp_event_t event_type; sctp_subtype_t subtype; \
sctp_state_t state; \ enum sctp_state state; \
struct sctp_endpoint *ep; \ struct sctp_endpoint *ep; \
\ \
event_type = SCTP_EVENT_T_PRIMITIVE; \ event_type = SCTP_EVENT_T_PRIMITIVE; \

12
net/sctp/sm_sideeffect.c
View File

@@ -53,7 +53,7 @@
static int sctp_cmd_interpreter(sctp_event_t event_type, static int sctp_cmd_interpreter(sctp_event_t event_type,
sctp_subtype_t subtype, sctp_subtype_t subtype,
sctp_state_t state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
struct sctp_association *asoc, struct sctp_association *asoc,
void *event_arg, void *event_arg,
@@ -61,7 +61,7 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
sctp_cmd_seq_t *commands, sctp_cmd_seq_t *commands,
gfp_t gfp); gfp_t gfp);
static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype, static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
sctp_state_t state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
struct sctp_association **asoc, struct sctp_association **asoc,
void *event_arg, void *event_arg,
@@ -843,7 +843,7 @@ static void sctp_cmd_assoc_update(sctp_cmd_seq_t *cmds,
/* Helper function to change the state of an association. */ /* Helper function to change the state of an association. */
static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds, static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds,
struct sctp_association *asoc, struct sctp_association *asoc,
sctp_state_t state) enum sctp_state state)
{ {
struct sock *sk = asoc->base.sk; struct sock *sk = asoc->base.sk;
@@ -1140,7 +1140,7 @@ static void sctp_cmd_send_asconf(struct sctp_association *asoc)
* good place to start. * good place to start.
*/ */
int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype, 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 *ep, struct sctp_endpoint *ep,
struct sctp_association *asoc, struct sctp_association *asoc,
void *event_arg, void *event_arg,
@@ -1179,7 +1179,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. * 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(sctp_event_t event_type, sctp_subtype_t subtype,
sctp_state_t state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
struct sctp_association **asoc, struct sctp_association **asoc,
void *event_arg, void *event_arg,
@@ -1265,7 +1265,7 @@ bail:
/* This is the side-effect interpreter. */ /* This is the side-effect interpreter. */
static int sctp_cmd_interpreter(sctp_event_t event_type, static int sctp_cmd_interpreter(sctp_event_t event_type,
sctp_subtype_t subtype, sctp_subtype_t subtype,
sctp_state_t state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
struct sctp_association *asoc, struct sctp_association *asoc,
void *event_arg, void *event_arg,

16
net/sctp/sm_statetable.c
View File

@@ -52,9 +52,10 @@ other_event_table[SCTP_NUM_OTHER_TYPES][SCTP_STATE_NUM_STATES];
static const sctp_sm_table_entry_t static const sctp_sm_table_entry_t
timeout_event_table[SCTP_NUM_TIMEOUT_TYPES][SCTP_STATE_NUM_STATES]; timeout_event_table[SCTP_NUM_TIMEOUT_TYPES][SCTP_STATE_NUM_STATES];
static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(struct net *net, static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(
enum sctp_cid cid, struct net *net,
sctp_state_t state); enum sctp_cid cid,
enum sctp_state state);
static const sctp_sm_table_entry_t bug = { static const sctp_sm_table_entry_t bug = {
@@ -78,7 +79,7 @@ static const sctp_sm_table_entry_t bug = {
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,
sctp_event_t event_type, sctp_event_t event_type,
sctp_state_t state, enum sctp_state state,
sctp_subtype_t event_subtype) sctp_subtype_t event_subtype)
{ {
switch (event_type) { switch (event_type) {
@@ -967,9 +968,10 @@ static const sctp_sm_table_entry_t timeout_event_table[SCTP_NUM_TIMEOUT_TYPES][S
TYPE_SCTP_EVENT_TIMEOUT_AUTOCLOSE, TYPE_SCTP_EVENT_TIMEOUT_AUTOCLOSE,
}; };
static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(struct net *net, static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(
enum sctp_cid cid, struct net *net,
sctp_state_t state) enum sctp_cid cid,
enum sctp_state state)
{ {
if (state > SCTP_STATE_MAX) if (state > SCTP_STATE_MAX)
return &bug; return &bug;