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

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

sctp: remove the typedef sctp_cookie_param_t 



This patch is to remove the typedef sctp_cookie_param_t, and
replace with struct sctp_cookie_param 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 cb1844c4

include/linux/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -342,10 +342,10 @@ struct sctp_initack_chunk { 
};



/* Section 3.3.3.1 State Cookie (7) */

typedef struct sctp_cookie_param {

struct sctp_cookie_param {

	struct sctp_paramhdr p;

	__u8 body[0];

} sctp_cookie_param_t;

};



/* Section 3.3.3.1 Unrecognized Parameters (8) */

typedef struct sctp_unrecognized_param {

net/sctp/sm_make_chunk.c

+10 −8
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static struct sctp_chunk *sctp_make_data(const struct sctp_association *asoc, 
static struct sctp_chunk *_sctp_make_chunk(const struct sctp_association *asoc,

					   __u8 type, __u8 flags, int paylen,

					   gfp_t gfp);

static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,

static struct sctp_cookie_param *sctp_pack_cookie(

					const struct sctp_endpoint *ep,

					const struct sctp_association *asoc,

					const struct sctp_chunk *init_chunk,

					int *cookie_len,
@@ -387,7 +388,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc, 
	union sctp_params addrs;

	struct sctp_sock *sp;

	int addrs_len;

	sctp_cookie_param_t *cookie;

	struct sctp_cookie_param *cookie;

	int cookie_len;

	size_t chunksize;

	struct sctp_adaptation_ind_param aiparam;
@@ -1595,14 +1596,15 @@ struct sctp_association *sctp_make_temp_asoc(const struct sctp_endpoint *ep, 
/* Build a cookie representing asoc.

 * This INCLUDES the param header needed to put the cookie in the INIT ACK.

 */

static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,

static struct sctp_cookie_param *sctp_pack_cookie(

					const struct sctp_endpoint *ep,

					const struct sctp_association *asoc,

					const struct sctp_chunk *init_chunk,

					int *cookie_len,

					const __u8 *raw_addrs, int addrs_len)

{

	sctp_cookie_param_t *retval;

	struct sctp_signed_cookie *cookie;

	struct sctp_cookie_param *retval;

	int headersize, bodysize;



	/* Header size is static data prior to the actual cookie, including