diff options
| author | Xin Long <lucien.xin@gmail.com> | 2017-08-05 20:00:04 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-06 21:33:42 -0700 |
| commit | bfc6f8270fefb323662d1d7713f940149f27b7f1 (patch) | |
| tree | 3236aad70ec3c97f83d6c70aa5688fc0517d564b /net/sctp/sm_sideeffect.c | |
| parent | 61f0eb072294a148f707335d4d7f858b2af73770 (diff) | |
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: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
| -rw-r--r-- | net/sctp/sm_sideeffect.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index b545c768cb9e..4a12d29d9aa1 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -52,7 +52,7 @@ #include <net/sctp/sm.h> static int sctp_cmd_interpreter(enum sctp_event event_type, - sctp_subtype_t subtype, + union sctp_subtype subtype, enum sctp_state state, struct sctp_endpoint *ep, struct sctp_association *asoc, @@ -60,7 +60,8 @@ static int sctp_cmd_interpreter(enum sctp_event event_type, sctp_disposition_t status, sctp_cmd_seq_t *commands, gfp_t gfp); -static int sctp_side_effects(enum sctp_event event_type, sctp_subtype_t subtype, +static int sctp_side_effects(enum sctp_event event_type, + union sctp_subtype subtype, enum sctp_state state, struct sctp_endpoint *ep, struct sctp_association **asoc, @@ -603,7 +604,7 @@ static void sctp_cmd_init_failed(sctp_cmd_seq_t *commands, static void sctp_cmd_assoc_failed(sctp_cmd_seq_t *commands, struct sctp_association *asoc, enum sctp_event event_type, - sctp_subtype_t subtype, + union sctp_subtype subtype, struct sctp_chunk *chunk, unsigned int error) { @@ -1140,7 +1141,7 @@ static void sctp_cmd_send_asconf(struct sctp_association *asoc) * good place to start. */ 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) { @@ -1148,7 +1149,7 @@ int sctp_do_sm(struct net *net, enum sctp_event event_type, const sctp_sm_table_entry_t *state_fn; sctp_disposition_t status; int error = 0; - typedef const char *(printfn_t)(sctp_subtype_t); + typedef const char *(printfn_t)(union sctp_subtype); static printfn_t *table[] = { NULL, sctp_cname, sctp_tname, sctp_oname, sctp_pname, }; @@ -1176,7 +1177,8 @@ int sctp_do_sm(struct net *net, enum sctp_event event_type, /***************************************************************** * This the master state function side effect processing function. *****************************************************************/ -static int sctp_side_effects(enum sctp_event event_type, sctp_subtype_t subtype, +static int sctp_side_effects(enum sctp_event event_type, + union sctp_subtype subtype, enum sctp_state state, struct sctp_endpoint *ep, struct sctp_association **asoc, @@ -1262,7 +1264,7 @@ bail: /* This is the side-effect interpreter. */ static int sctp_cmd_interpreter(enum sctp_event event_type, - sctp_subtype_t subtype, + union sctp_subtype subtype, enum sctp_state state, struct sctp_endpoint *ep, struct sctp_association *asoc, |