Commit 88ee48c1 authored by Xin Long's avatar Xin Long Committed by David S. Miller

sctp: rename enum sctp_event to sctp_event_type

sctp_event is a structure name defined in RFC for sockopt
SCTP_EVENT. To avoid the conflict, rename it.
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1e3a059
...@@ -71,7 +71,7 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM }; ...@@ -71,7 +71,7 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM };
SCTP_NUM_AUTH_CHUNK_TYPES) SCTP_NUM_AUTH_CHUNK_TYPES)
/* These are the different flavours of event. */ /* These are the different flavours of event. */
enum sctp_event { enum sctp_event_type {
SCTP_EVENT_T_CHUNK = 1, SCTP_EVENT_T_CHUNK = 1,
SCTP_EVENT_T_TIMEOUT, SCTP_EVENT_T_TIMEOUT,
SCTP_EVENT_T_OTHER, SCTP_EVENT_T_OTHER,
......
...@@ -173,7 +173,7 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire; ...@@ -173,7 +173,7 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire;
__u8 sctp_get_chunk_type(struct sctp_chunk *chunk); __u8 sctp_get_chunk_type(struct sctp_chunk *chunk);
const struct sctp_sm_table_entry *sctp_sm_lookup_event( const struct sctp_sm_table_entry *sctp_sm_lookup_event(
struct net *net, struct net *net,
enum sctp_event event_type, enum sctp_event_type event_type,
enum sctp_state state, enum sctp_state state,
union sctp_subtype event_subtype); union sctp_subtype event_subtype);
int sctp_chunk_iif(const struct sctp_chunk *); int sctp_chunk_iif(const struct sctp_chunk *);
...@@ -313,7 +313,7 @@ struct sctp_chunk *sctp_process_strreset_resp( ...@@ -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, enum sctp_event event_type, int sctp_do_sm(struct net *net, enum sctp_event_type event_type,
union sctp_subtype subtype, enum sctp_state state, union sctp_subtype subtype, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_association *asoc, struct sctp_endpoint *ep, struct sctp_association *asoc,
void *event_arg, gfp_t gfp); void *event_arg, gfp_t gfp);
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
int sctp_primitive_ ## name(struct net *net, struct sctp_association *asoc, \ int sctp_primitive_ ## name(struct net *net, struct sctp_association *asoc, \
void *arg) { \ void *arg) { \
int error = 0; \ int error = 0; \
enum sctp_event event_type; union sctp_subtype subtype; \ enum sctp_event_type event_type; union sctp_subtype subtype; \
enum sctp_state state; \ enum sctp_state state; \
struct sctp_endpoint *ep; \ struct sctp_endpoint *ep; \
\ \
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <net/sctp/sm.h> #include <net/sctp/sm.h>
#include <net/sctp/stream_sched.h> #include <net/sctp/stream_sched.h>
static int sctp_cmd_interpreter(enum sctp_event event_type, static int sctp_cmd_interpreter(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
...@@ -61,7 +61,7 @@ static int sctp_cmd_interpreter(enum sctp_event event_type, ...@@ -61,7 +61,7 @@ static int sctp_cmd_interpreter(enum sctp_event event_type,
enum sctp_disposition status, enum sctp_disposition status,
struct sctp_cmd_seq *commands, struct sctp_cmd_seq *commands,
gfp_t gfp); gfp_t gfp);
static int sctp_side_effects(enum sctp_event event_type, static int sctp_side_effects(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
...@@ -623,7 +623,7 @@ static void sctp_cmd_init_failed(struct sctp_cmd_seq *commands, ...@@ -623,7 +623,7 @@ static void sctp_cmd_init_failed(struct sctp_cmd_seq *commands,
/* Worker routine to handle SCTP_CMD_ASSOC_FAILED. */ /* Worker routine to handle SCTP_CMD_ASSOC_FAILED. */
static void sctp_cmd_assoc_failed(struct sctp_cmd_seq *commands, static void sctp_cmd_assoc_failed(struct sctp_cmd_seq *commands,
struct sctp_association *asoc, struct sctp_association *asoc,
enum sctp_event event_type, enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
struct sctp_chunk *chunk, struct sctp_chunk *chunk,
unsigned int error) unsigned int error)
...@@ -1162,7 +1162,7 @@ static void sctp_cmd_send_asconf(struct sctp_association *asoc) ...@@ -1162,7 +1162,7 @@ static void sctp_cmd_send_asconf(struct sctp_association *asoc)
* If you want to understand all of lksctp, this is a * If you want to understand all of lksctp, this is a
* good place to start. * good place to start.
*/ */
int sctp_do_sm(struct net *net, enum sctp_event event_type, int sctp_do_sm(struct net *net, enum sctp_event_type event_type,
union sctp_subtype subtype, enum sctp_state state, union sctp_subtype subtype, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_association *asoc, struct sctp_endpoint *ep, struct sctp_association *asoc,
void *event_arg, gfp_t gfp) void *event_arg, gfp_t gfp)
...@@ -1199,7 +1199,7 @@ int sctp_do_sm(struct net *net, enum sctp_event event_type, ...@@ -1199,7 +1199,7 @@ int sctp_do_sm(struct net *net, enum sctp_event event_type,
/***************************************************************** /*****************************************************************
* This the master state function side effect processing function. * This the master state function side effect processing function.
*****************************************************************/ *****************************************************************/
static int sctp_side_effects(enum sctp_event event_type, static int sctp_side_effects(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
...@@ -1285,7 +1285,7 @@ static int sctp_side_effects(enum sctp_event event_type, ...@@ -1285,7 +1285,7 @@ static int sctp_side_effects(enum sctp_event event_type,
********************************************************************/ ********************************************************************/
/* This is the side-effect interpreter. */ /* This is the side-effect interpreter. */
static int sctp_cmd_interpreter(enum sctp_event event_type, static int sctp_cmd_interpreter(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
......
...@@ -79,7 +79,7 @@ static const struct sctp_sm_table_entry bug = { ...@@ -79,7 +79,7 @@ static const struct sctp_sm_table_entry bug = {
const struct sctp_sm_table_entry *sctp_sm_lookup_event( const struct sctp_sm_table_entry *sctp_sm_lookup_event(
struct net *net, struct net *net,
enum sctp_event event_type, enum sctp_event_type event_type,
enum sctp_state state, enum sctp_state state,
union sctp_subtype event_subtype) union sctp_subtype event_subtype)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment