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

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

sctp: remove the typedef sctp_param_t 



This patch is to remove the typedef sctp_param_t, and replace with
struct sctp_paramhdr in the places where it's using this typedef.

It is also to remove the useless declaration sctp_addip_addr_config
and fix the lack of params for some other functions' declaration.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c918704

include/linux/sctp.h

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct sctp_paramhdr { 
	__be16 length;

};



typedef enum {

enum sctp_param {



	/* RFC 2960 Section 3.3.5 */

	SCTP_PARAM_HEARTBEAT_INFO		= cpu_to_be16(1),
@@ -207,7 +207,7 @@ typedef enum { 
	SCTP_PARAM_RESET_RESPONSE		= cpu_to_be16(0x0010),

	SCTP_PARAM_RESET_ADD_OUT_STREAMS	= cpu_to_be16(0x0011),

	SCTP_PARAM_RESET_ADD_IN_STREAMS		= cpu_to_be16(0x0012),

} sctp_param_t; /* enum */

}; /* enum */





/* RFC 2960 Section 3.2.1

include/net/sctp/sm.h

+6 −8
Original line number Diff line number Diff line
@@ -325,19 +325,17 @@ void sctp_generate_heartbeat_event(unsigned long peer); 
void sctp_generate_reconf_event(unsigned long peer);

void sctp_generate_proto_unreach_event(unsigned long peer);



void sctp_ootb_pkt_free(struct sctp_packet *);

void sctp_ootb_pkt_free(struct sctp_packet *packet);



struct sctp_association *sctp_unpack_cookie(const struct sctp_endpoint *,

				       const struct sctp_association *,

				       struct sctp_chunk *,

struct sctp_association *sctp_unpack_cookie(const struct sctp_endpoint *ep,

				       const struct sctp_association *asoc,

				       struct sctp_chunk *chunk,

				       gfp_t gfp, int *err,

				       struct sctp_chunk **err_chk_p);

int sctp_addip_addr_config(struct sctp_association *, sctp_param_t,

			   struct sockaddr_storage*, int);



/* 3rd level prototypes */

__u32 sctp_generate_tag(const struct sctp_endpoint *);

__u32 sctp_generate_tsn(const struct sctp_endpoint *);

__u32 sctp_generate_tag(const struct sctp_endpoint *ep);

__u32 sctp_generate_tsn(const struct sctp_endpoint *ep);



/* Extern declarations for major data structures.  */

extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];

net/sctp/sm_make_chunk.c

+1 −1
Original line number Diff line number Diff line
@@ -1882,7 +1882,7 @@ struct __sctp_missing { 
 * Report a missing mandatory parameter.

 */

static int sctp_process_missing_param(const struct sctp_association *asoc,

				      sctp_param_t paramtype,

				      enum sctp_param paramtype,

				      struct sctp_chunk *chunk,

				      struct sctp_chunk **errp)

{