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

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

sctp: remove the typedef sctp_cid_t 



This patch is to remove the typedef sctp_cid_t, and replace
with struct sctp_cid 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 922dbc5b

include/linux/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct sctp_chunkhdr { 
 * Value field. It takes a value from 0 to 254. The value of 255 is

 * reserved for future use as an extension field.

 */

typedef enum {

enum sctp_cid {

	SCTP_CID_DATA			= 0,

        SCTP_CID_INIT			= 1,

        SCTP_CID_INIT_ACK		= 2,
@@ -109,7 +109,7 @@ typedef enum { 
	SCTP_CID_ASCONF			= 0xC1,

	SCTP_CID_ASCONF_ACK		= 0x80,

	SCTP_CID_RECONF			= 0x82,

} sctp_cid_t; /* enum */

}; /* enum */





/* Section 3.2

include/net/sctp/auth.h

+4 −2
Original line number Diff line number Diff line
@@ -97,8 +97,10 @@ void sctp_auth_asoc_set_default_hmac(struct sctp_association *asoc, 
				     struct sctp_hmac_algo_param *hmacs);

int sctp_auth_asoc_verify_hmac_id(const struct sctp_association *asoc,

				    __be16 hmac_id);

int sctp_auth_send_cid(sctp_cid_t chunk, const struct sctp_association *asoc);

int sctp_auth_recv_cid(sctp_cid_t chunk, const struct sctp_association *asoc);

int sctp_auth_send_cid(enum sctp_cid chunk,

		       const struct sctp_association *asoc);

int sctp_auth_recv_cid(enum sctp_cid chunk,

		       const struct sctp_association *asoc);

void sctp_auth_calculate_hmac(const struct sctp_association *asoc,

			    struct sk_buff *skb,

			    struct sctp_auth_chunk *auth, gfp_t gfp);

include/net/sctp/constants.h

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ typedef enum { 
 */



typedef union {

	sctp_cid_t chunk;

	enum sctp_cid chunk;

	sctp_event_timeout_t timeout;

	sctp_event_other_t other;

	sctp_event_primitive_t primitive;
@@ -141,7 +141,7 @@ static inline sctp_subtype_t \ 
SCTP_ST_## _name (_type _arg)		\

{ sctp_subtype_t _retval; _retval._elt = _arg; return _retval; }



SCTP_SUBTYPE_CONSTRUCTOR(CHUNK,		sctp_cid_t,		chunk)

SCTP_SUBTYPE_CONSTRUCTOR(CHUNK,		enum sctp_cid,		chunk)

SCTP_SUBTYPE_CONSTRUCTOR(TIMEOUT,	sctp_event_timeout_t,	timeout)

SCTP_SUBTYPE_CONSTRUCTOR(OTHER,		sctp_event_other_t,	other)

SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE,	sctp_event_primitive_t,	primitive)

include/net/sctp/structs.h

+1 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ 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,

		     sctp_cid_t, sctp_init_chunk_t *peer_init,

		     enum sctp_cid cid, sctp_init_chunk_t *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,

net/sctp/auth.c

+3 −3
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ void sctp_auth_asoc_set_default_hmac(struct sctp_association *asoc, 




/* Check to see if the given chunk is supposed to be authenticated */

static int __sctp_auth_cid(sctp_cid_t chunk, struct sctp_chunks_param *param)

static int __sctp_auth_cid(enum sctp_cid chunk, struct sctp_chunks_param *param)

{

	unsigned short len;

	int found = 0;
@@ -668,7 +668,7 @@ static int __sctp_auth_cid(sctp_cid_t chunk, struct sctp_chunks_param *param) 
}



/* Check if peer requested that this chunk is authenticated */

int sctp_auth_send_cid(sctp_cid_t chunk, const struct sctp_association *asoc)

int sctp_auth_send_cid(enum sctp_cid chunk, const struct sctp_association *asoc)

{

	if (!asoc)

		return 0;
@@ -680,7 +680,7 @@ int sctp_auth_send_cid(sctp_cid_t chunk, const struct sctp_association *asoc) 
}



/* Check if we requested that peer authenticate this chunk. */

int sctp_auth_recv_cid(sctp_cid_t chunk, const struct sctp_association *asoc)

int sctp_auth_recv_cid(enum sctp_cid chunk, const struct sctp_association *asoc)

{

	if (!asoc)

		return 0;