evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sctp: use common head of addr parameter to access member in addr-unrelated code

Browse source 
The 'p' member of struct sctp_paramhdr is common part for
IPv4 addr parameter and IPv6 addr parameter in union sctp_addr_param.

For addr-related code, use specified addr parameter.
Otherwise, use common header to access type/length member.

Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shan Wei 2011-04-18 19:11:47 +00:00 • committed by David S. Miller
parent 33c7cfdbb0
commit 6a435732ac
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/sctp/input.c
View file

@ -1017,7 +1017,7 @@ static struct sctp_association *__sctp_rcv_asconf_lookup(
/* Skip over the ADDIP header and find the Address parameter */ /* Skip over the ADDIP header and find the Address parameter */
param = (union sctp_addr_param *)(asconf + 1); param = (union sctp_addr_param *)(asconf + 1);
af = sctp_get_af_specific(param_type2af(param->v4.param_hdr.type)); af = sctp_get_af_specific(param_type2af(param->p.type));
if (unlikely(!af)) if (unlikely(!af))
return NULL; return NULL;

10
net/sctp/sm_make_chunk.c
View file

@ -2923,7 +2923,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
asconf_param->param_hdr.type != SCTP_PARAM_SET_PRIMARY) asconf_param->param_hdr.type != SCTP_PARAM_SET_PRIMARY)
return SCTP_ERROR_UNKNOWN_PARAM; return SCTP_ERROR_UNKNOWN_PARAM;
switch (addr_param->v4.param_hdr.type) { switch (addr_param->p.type) {
case SCTP_PARAM_IPV6_ADDRESS: case SCTP_PARAM_IPV6_ADDRESS:
if (!asoc->peer.ipv6_address) if (!asoc->peer.ipv6_address)
return SCTP_ERROR_DNS_FAILED; return SCTP_ERROR_DNS_FAILED;
@ -2936,7 +2936,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
return SCTP_ERROR_DNS_FAILED; return SCTP_ERROR_DNS_FAILED;
} }
af = sctp_get_af_specific(param_type2af(addr_param->v4.param_hdr.type)); af = sctp_get_af_specific(param_type2af(addr_param->p.type));
if (unlikely(!af)) if (unlikely(!af))
return SCTP_ERROR_DNS_FAILED; return SCTP_ERROR_DNS_FAILED;
@ -3100,7 +3100,7 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
/* Skip the address parameter and store a pointer to the first /* Skip the address parameter and store a pointer to the first
* asconf parameter. * asconf parameter.
*/ */
length = ntohs(addr_param->v4.param_hdr.length); length = ntohs(addr_param->p.length);
asconf_param = (sctp_addip_param_t *)((void *)addr_param + length); asconf_param = (sctp_addip_param_t *)((void *)addr_param + length);
chunk_len -= length; chunk_len -= length;
@ -3177,7 +3177,7 @@ static void sctp_asconf_param_success(struct sctp_association *asoc,
((void *)asconf_param + sizeof(sctp_addip_param_t)); ((void *)asconf_param + sizeof(sctp_addip_param_t));
/* We have checked the packet before, so we do not check again. */ /* We have checked the packet before, so we do not check again. */
af = sctp_get_af_specific(param_type2af(addr_param->v4.param_hdr.type)); af = sctp_get_af_specific(param_type2af(addr_param->p.type));
af->from_addr_param(&addr, addr_param, htons(bp->port), 0); af->from_addr_param(&addr, addr_param, htons(bp->port), 0);
switch (asconf_param->param_hdr.type) { switch (asconf_param->param_hdr.type) {
@ -3304,7 +3304,7 @@ int sctp_process_asconf_ack(struct sctp_association *asoc,
/* Skip the address parameter in the last asconf sent and store a /* Skip the address parameter in the last asconf sent and store a
* pointer to the first asconf parameter. * pointer to the first asconf parameter.
*/ */
length = ntohs(addr_param->v4.param_hdr.length); length = ntohs(addr_param->p.length);
asconf_param = (sctp_addip_param_t *)((void *)addr_param + length); asconf_param = (sctp_addip_param_t *)((void *)addr_param + length);
asconf_len -= length; asconf_len -= length;