Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150622
b: refs/heads/master
c: 945e5ab
h: refs/heads/master
v: v3
  • Loading branch information
Wei Yongjun authored and Vlad Yasevich committed Jun 3, 2009
1 parent 94579c7 commit b5ec9a6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a987f762cafb25c0fedf88f15e328edd897210ed
refs/heads/master: 945e5abceef8bdb85d8455e7f9a3cd647dd8b156
12 changes: 6 additions & 6 deletions trunk/net/sctp/sm_make_chunk.c
Original file line number Diff line number Diff line change
Expand Up @@ -2864,19 +2864,19 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
switch (addr_param->v4.param_hdr.type) {
case SCTP_PARAM_IPV6_ADDRESS:
if (!asoc->peer.ipv6_address)
return SCTP_ERROR_INV_PARAM;
return SCTP_ERROR_DNS_FAILED;
break;
case SCTP_PARAM_IPV4_ADDRESS:
if (!asoc->peer.ipv4_address)
return SCTP_ERROR_INV_PARAM;
return SCTP_ERROR_DNS_FAILED;
break;
default:
return SCTP_ERROR_INV_PARAM;
return SCTP_ERROR_DNS_FAILED;
}

af = sctp_get_af_specific(param_type2af(addr_param->v4.param_hdr.type));
if (unlikely(!af))
return SCTP_ERROR_INV_PARAM;
return SCTP_ERROR_DNS_FAILED;

af->from_addr_param(&addr, addr_param, htons(asoc->peer.port), 0);

Expand All @@ -2886,7 +2886,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
* make sure we check for that)
*/
if (!af->is_any(&addr) && !af->addr_valid(&addr, NULL, asconf->skb))
return SCTP_ERROR_INV_PARAM;
return SCTP_ERROR_DNS_FAILED;

switch (asconf_param->param_hdr.type) {
case SCTP_PARAM_ADD_IP:
Expand Down Expand Up @@ -2954,7 +2954,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,

peer = sctp_assoc_lookup_paddr(asoc, &addr);
if (!peer)
return SCTP_ERROR_INV_PARAM;
return SCTP_ERROR_DNS_FAILED;

sctp_assoc_set_primary(asoc, peer);
break;
Expand Down

0 comments on commit b5ec9a6

Please sign in to comment.