leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sctp: remove the typedef sctp_ipv4addr_param_t

Browse Source 
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: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2017-07-17 11:29:49 +08:00 committed by David S. Miller
parent aed20a53a7
commit a38905e6aa
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/sctp.h
View File

@ -273,10 +273,10 @@ struct sctp_init_chunk {
/* Section 3.3.2.1. IPv4 Address Parameter (5) */ /* Section 3.3.2.1. IPv4 Address Parameter (5) */
typedef struct sctp_ipv4addr_param { struct sctp_ipv4addr_param {
struct sctp_paramhdr param_hdr; struct sctp_paramhdr param_hdr;
struct in_addr addr; struct in_addr addr;
} sctp_ipv4addr_param_t; };
/* Section 3.3.2.1. IPv6 Address Parameter (6) */ /* Section 3.3.2.1. IPv6 Address Parameter (6) */
typedef struct sctp_ipv6addr_param { typedef struct sctp_ipv6addr_param {

2
net/sctp/protocol.c
View File

@ -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, static int sctp_v4_to_addr_param(const union sctp_addr *addr,
union sctp_addr_param *param) 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.type = SCTP_PARAM_IPV4_ADDRESS;
param->v4.param_hdr.length = htons(length); param->v4.param_hdr.length = htons(length);

2
net/sctp/sm_make_chunk.c
View File

@ -3153,7 +3153,7 @@ bool sctp_verify_asconf(const struct sctp_association *asoc,
case SCTP_PARAM_ERR_CAUSE: case SCTP_PARAM_ERR_CAUSE:
break; break;
case SCTP_PARAM_IPV4_ADDRESS: case SCTP_PARAM_IPV4_ADDRESS:
if (length != sizeof(sctp_ipv4addr_param_t)) if (length != sizeof(struct sctp_ipv4addr_param))
return false; return false;
/* ensure there is only one addr param and it's in the /* ensure there is only one addr param and it's in the
* beginning of addip_hdr params, or we reject it. * beginning of addip_hdr params, or we reject it.