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

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

sctp: remove the typedef sctp_ipv4addr_param_t 



This patch is to remove the typedef sctp_ipv4addr_param_t, and replace
with struct sctp_ipv4addr_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 aed20a53

include/linux/sctp.h

+3 −3
Original line number Diff line number Diff line
@@ -273,10 +273,10 @@ struct sctp_init_chunk { 




/* Section 3.3.2.1. IPv4 Address Parameter (5) */

typedef struct sctp_ipv4addr_param {

struct sctp_ipv4addr_param {

	struct sctp_paramhdr param_hdr;

	struct in_addr addr;

} sctp_ipv4addr_param_t;

};



/* Section 3.3.2.1. IPv6 Address Parameter (6) */

typedef struct sctp_ipv6addr_param {

net/sctp/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void sctp_v4_from_addr_param(union sctp_addr *addr, 
static int sctp_v4_to_addr_param(const union sctp_addr *addr,

				 union sctp_addr_param *param)

{

	int length = sizeof(sctp_ipv4addr_param_t);

	int length = sizeof(struct sctp_ipv4addr_param);



	param->v4.param_hdr.type = SCTP_PARAM_IPV4_ADDRESS;

	param->v4.param_hdr.length = htons(length);

net/sctp/sm_make_chunk.c

+1 −1
Original line number Diff line number Diff line
@@ -3153,7 +3153,7 @@ bool sctp_verify_asconf(const struct sctp_association *asoc, 
		case SCTP_PARAM_ERR_CAUSE:

			break;

		case SCTP_PARAM_IPV4_ADDRESS:

			if (length != sizeof(sctp_ipv4addr_param_t))

			if (length != sizeof(struct sctp_ipv4addr_param))

				return false;

			/* ensure there is only one addr param and it's in the

			 * beginning of addip_hdr params, or we reject it.