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

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

sctp: remove the typedef sctp_sackhdr_t 



This patch is to remove the typedef sctp_sackhdr_t, and replace
with struct sctp_sackhdr 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 afd93b7b

include/linux/sctp.h

+3 −3
Original line number Diff line number Diff line
@@ -373,17 +373,17 @@ union sctp_sack_variable { 
	__be32 dup;

};



typedef struct sctp_sackhdr {

struct sctp_sackhdr {

	__be32 cum_tsn_ack;

	__be32 a_rwnd;

	__be16 num_gap_ack_blocks;

	__be16 num_dup_tsns;

	union sctp_sack_variable variable[0];

} sctp_sackhdr_t;

};



typedef struct sctp_sack_chunk {

	struct sctp_chunkhdr chunk_hdr;

	sctp_sackhdr_t sack_hdr;

	struct sctp_sackhdr sack_hdr;

} sctp_sack_chunk_t;

include/net/sctp/command.h

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ typedef union { 
	struct sctp_init_chunk *init;

	struct sctp_ulpevent *ulpevent;

	struct sctp_packet *packet;

	sctp_sackhdr_t *sackh;

	struct sctp_sackhdr *sackh;

	struct sctp_datamsg *msg;

} sctp_arg_t;
@@ -176,7 +176,7 @@ SCTP_ARG_CONSTRUCTOR(BA, struct sctp_bind_addr *, bp) 
SCTP_ARG_CONSTRUCTOR(PEER_INIT,	struct sctp_init_chunk *, init)

SCTP_ARG_CONSTRUCTOR(ULPEVENT,  struct sctp_ulpevent *, ulpevent)

SCTP_ARG_CONSTRUCTOR(PACKET,	struct sctp_packet *, packet)

SCTP_ARG_CONSTRUCTOR(SACKH,	sctp_sackhdr_t *, sackh)

SCTP_ARG_CONSTRUCTOR(SACKH,	struct sctp_sackhdr *, sackh)

SCTP_ARG_CONSTRUCTOR(DATAMSG,	struct sctp_datamsg *, msg)



static inline sctp_arg_t SCTP_FORCE(void)

net/sctp/sm_statefuns.c

+1 −1
Original line number Diff line number Diff line
@@ -3187,7 +3187,7 @@ sctp_disposition_t sctp_sf_eat_sack_6_2(struct net *net, 
					sctp_cmd_seq_t *commands)

{

	struct sctp_chunk *chunk = arg;

	sctp_sackhdr_t *sackh;

	struct sctp_sackhdr *sackh;

	__u32 ctsn;



	if (!sctp_vtag_verify(chunk, asoc))