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

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

sctp: remove the typedef sctp_cmd_t 



This patch is to remove the typedef sctp_cmd_t, and
replace with enum sctp_cmd 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 b7ef2618

include/net/sctp/command.h

+7 −7
Original line number Diff line number Diff line
@@ -196,15 +196,15 @@ static inline sctp_arg_t SCTP_NULL(void) 
	return retval;

}



typedef struct {

struct sctp_cmd {

	sctp_arg_t obj;

	sctp_verb_t verb;

} sctp_cmd_t;

};



typedef struct {

	sctp_cmd_t cmds[SCTP_MAX_NUM_COMMANDS];

	sctp_cmd_t *last_used_slot;

	sctp_cmd_t *next_cmd;

	struct sctp_cmd cmds[SCTP_MAX_NUM_COMMANDS];

	struct sctp_cmd *last_used_slot;

	struct sctp_cmd *next_cmd;

} sctp_cmd_seq_t;
@@ -228,7 +228,7 @@ static inline int sctp_init_cmd_seq(sctp_cmd_seq_t *seq) 
static inline void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb,

				   sctp_arg_t obj)

{

	sctp_cmd_t *cmd = seq->last_used_slot - 1;

	struct sctp_cmd *cmd = seq->last_used_slot - 1;



	BUG_ON(cmd < seq->cmds);
@@ -240,7 +240,7 @@ static inline void sctp_add_cmd_sf(sctp_cmd_seq_t *seq, sctp_verb_t verb, 
/* Return the next command structure in an sctp_cmd_seq.

 * Return NULL at the end of the sequence.

 */

static inline sctp_cmd_t *sctp_next_cmd(sctp_cmd_seq_t *seq)

static inline struct sctp_cmd *sctp_next_cmd(sctp_cmd_seq_t *seq)

{

	if (seq->next_cmd <= seq->last_used_slot)

		return NULL;

net/sctp/sm_sideeffect.c

+1 −1
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ static int sctp_cmd_interpreter(enum sctp_event event_type, 
	struct sctp_sock *sp = sctp_sk(sk);

	int error = 0;

	int force;

	sctp_cmd_t *cmd;

	struct sctp_cmd *cmd;

	struct sctp_chunk *new_obj;

	struct sctp_chunk *chunk = NULL;

	struct sctp_packet *packet;