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

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

sctp: remove the typedef sctp_init_chunk_t 



This patch is to remove the typedef sctp_init_chunk_t, and replace
with struct sctp_init_chunk 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 4ae70c08

include/linux/sctp.h

+3 −3
Original line number Diff line number Diff line
@@ -266,10 +266,10 @@ struct sctp_inithdr { 
	__u8  params[0];

};



typedef struct sctp_init_chunk {

struct sctp_init_chunk {

	struct sctp_chunkhdr chunk_hdr;

	struct sctp_inithdr init_hdr;

} sctp_init_chunk_t;

};





/* Section 3.3.2.1. IPv4 Address Parameter (5) */
@@ -341,7 +341,7 @@ typedef struct sctp_hmac_algo_param { 
 *   The INIT ACK chunk is used to acknowledge the initiation of an SCTP

 *   association.

 */

typedef sctp_init_chunk_t sctp_initack_chunk_t;

typedef struct sctp_init_chunk sctp_initack_chunk_t;



/* Section 3.3.3.1 State Cookie (7) */

typedef struct sctp_cookie_param {

include/net/sctp/command.h

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ typedef union { 
	struct sctp_association *asoc;

	struct sctp_transport *transport;

	struct sctp_bind_addr *bp;

	sctp_init_chunk_t *init;

	struct sctp_init_chunk *init;

	struct sctp_ulpevent *ulpevent;

	struct sctp_packet *packet;

	sctp_sackhdr_t *sackh;
@@ -173,7 +173,7 @@ SCTP_ARG_CONSTRUCTOR(CHUNK, struct sctp_chunk *, chunk) 
SCTP_ARG_CONSTRUCTOR(ASOC,	struct sctp_association *, asoc)

SCTP_ARG_CONSTRUCTOR(TRANSPORT,	struct sctp_transport *, transport)

SCTP_ARG_CONSTRUCTOR(BA,	struct sctp_bind_addr *, bp)

SCTP_ARG_CONSTRUCTOR(PEER_INIT,	sctp_init_chunk_t *, init)

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)

include/net/sctp/structs.h

+2 −2
Original line number Diff line number Diff line
@@ -1298,11 +1298,11 @@ int sctp_has_association(struct net *net, const union sctp_addr *laddr, 


int sctp_verify_init(struct net *net, const struct sctp_endpoint *ep,

		     const struct sctp_association *asoc,

		     enum sctp_cid cid, sctp_init_chunk_t *peer_init,

		     enum sctp_cid cid, struct sctp_init_chunk *peer_init,

		     struct sctp_chunk *chunk, struct sctp_chunk **err_chunk);

int sctp_process_init(struct sctp_association *, struct sctp_chunk *chunk,

		      const union sctp_addr *peer,

		      sctp_init_chunk_t *init, gfp_t gfp);

		      struct sctp_init_chunk *init, gfp_t gfp);

__u32 sctp_generate_tag(const struct sctp_endpoint *);

__u32 sctp_generate_tsn(const struct sctp_endpoint *);

net/sctp/input.c

+2 −2
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net, 
	union sctp_addr *paddr = &addr;

	struct sctphdr *sh = sctp_hdr(skb);

	union sctp_params params;

	sctp_init_chunk_t *init;

	struct sctp_init_chunk *init;

	struct sctp_af *af;



	/*
@@ -1070,7 +1070,7 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net, 
	/* Find the start of the TLVs and the end of the chunk.  This is

	 * the region we search for address parameters.

	 */

	init = (sctp_init_chunk_t *)skb->data;

	init = (struct sctp_init_chunk *)skb->data;



	/* Walk the parameters looking for embedded addresses. */

	sctp_walk_params(params, init, init_hdr.params) {

net/sctp/sm_make_chunk.c

+3 −3
Original line number Diff line number Diff line
@@ -2242,8 +2242,8 @@ static sctp_ierror_t sctp_verify_param(struct net *net, 
/* Verify the INIT packet before we process it.  */

int sctp_verify_init(struct net *net, const struct sctp_endpoint *ep,

		     const struct sctp_association *asoc, enum sctp_cid cid,

		     sctp_init_chunk_t *peer_init, struct sctp_chunk *chunk,

		     struct sctp_chunk **errp)

		     struct sctp_init_chunk *peer_init,

		     struct sctp_chunk *chunk, struct sctp_chunk **errp)

{

	union sctp_params param;

	bool has_cookie = false;
@@ -2307,7 +2307,7 @@ int sctp_verify_init(struct net *net, const struct sctp_endpoint *ep, 
 */

int sctp_process_init(struct sctp_association *asoc, struct sctp_chunk *chunk,

		      const union sctp_addr *peer_addr,

		      sctp_init_chunk_t *peer_init, gfp_t gfp)

		      struct sctp_init_chunk *peer_init, gfp_t gfp)

{

	struct net *net = sock_net(asoc->base.sk);

	union sctp_params param;