diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:25:18 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:20:11 -0500 |
commit | d808ad9ab8b1109239027c248c4652503b9d3029 (patch) | |
tree | cdd09b4987a4efd687a0a138491d626f8b674de5 /net/sctp/sm_make_chunk.c | |
parent | 10297b99315e5e08fe623ba56da35db1fee69ba9 (diff) |
[NET] SCTP: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
-rw-r--r-- | net/sctp/sm_make_chunk.c | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 0b1ddb1005ac..b97511655649 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -118,7 +118,7 @@ void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, | |||
118 | int padlen; | 118 | int padlen; |
119 | __u16 len; | 119 | __u16 len; |
120 | 120 | ||
121 | /* Cause code constants are now defined in network order. */ | 121 | /* Cause code constants are now defined in network order. */ |
122 | err.cause = cause_code; | 122 | err.cause = cause_code; |
123 | len = sizeof(sctp_errhdr_t) + paylen; | 123 | len = sizeof(sctp_errhdr_t) + paylen; |
124 | padlen = len % 4; | 124 | padlen = len % 4; |
@@ -295,11 +295,11 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc, | |||
295 | */ | 295 | */ |
296 | chunksize = sizeof(initack) + addrs_len + cookie_len + unkparam_len; | 296 | chunksize = sizeof(initack) + addrs_len + cookie_len + unkparam_len; |
297 | 297 | ||
298 | /* Tell peer that we'll do ECN only if peer advertised such cap. */ | 298 | /* Tell peer that we'll do ECN only if peer advertised such cap. */ |
299 | if (asoc->peer.ecn_capable) | 299 | if (asoc->peer.ecn_capable) |
300 | chunksize += sizeof(ecap_param); | 300 | chunksize += sizeof(ecap_param); |
301 | 301 | ||
302 | /* Tell peer that we'll do PR-SCTP only if peer advertised. */ | 302 | /* Tell peer that we'll do PR-SCTP only if peer advertised. */ |
303 | if (asoc->peer.prsctp_capable) | 303 | if (asoc->peer.prsctp_capable) |
304 | chunksize += sizeof(prsctp_param); | 304 | chunksize += sizeof(prsctp_param); |
305 | 305 | ||
@@ -728,7 +728,7 @@ struct sctp_chunk *sctp_make_shutdown_complete( | |||
728 | if (retval && chunk) | 728 | if (retval && chunk) |
729 | retval->transport = chunk->transport; | 729 | retval->transport = chunk->transport; |
730 | 730 | ||
731 | return retval; | 731 | return retval; |
732 | } | 732 | } |
733 | 733 | ||
734 | /* Create an ABORT. Note that we set the T bit if we have no | 734 | /* Create an ABORT. Note that we set the T bit if we have no |
@@ -844,7 +844,7 @@ err_chunk: | |||
844 | return retval; | 844 | return retval; |
845 | } | 845 | } |
846 | 846 | ||
847 | /* Make an ABORT chunk with a PROTOCOL VIOLATION cause code. */ | 847 | /* Make an ABORT chunk with a PROTOCOL VIOLATION cause code. */ |
848 | struct sctp_chunk *sctp_make_abort_violation( | 848 | struct sctp_chunk *sctp_make_abort_violation( |
849 | const struct sctp_association *asoc, | 849 | const struct sctp_association *asoc, |
850 | const struct sctp_chunk *chunk, | 850 | const struct sctp_chunk *chunk, |
@@ -1265,8 +1265,8 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep, | |||
1265 | /* Header size is static data prior to the actual cookie, including | 1265 | /* Header size is static data prior to the actual cookie, including |
1266 | * any padding. | 1266 | * any padding. |
1267 | */ | 1267 | */ |
1268 | headersize = sizeof(sctp_paramhdr_t) + | 1268 | headersize = sizeof(sctp_paramhdr_t) + |
1269 | (sizeof(struct sctp_signed_cookie) - | 1269 | (sizeof(struct sctp_signed_cookie) - |
1270 | sizeof(struct sctp_cookie)); | 1270 | sizeof(struct sctp_cookie)); |
1271 | bodysize = sizeof(struct sctp_cookie) | 1271 | bodysize = sizeof(struct sctp_cookie) |
1272 | + ntohs(init_chunk->chunk_hdr->length) + addrs_len; | 1272 | + ntohs(init_chunk->chunk_hdr->length) + addrs_len; |
@@ -1315,7 +1315,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep, | |||
1315 | memcpy((__u8 *)&cookie->c.peer_init[0] + | 1315 | memcpy((__u8 *)&cookie->c.peer_init[0] + |
1316 | ntohs(init_chunk->chunk_hdr->length), raw_addrs, addrs_len); | 1316 | ntohs(init_chunk->chunk_hdr->length), raw_addrs, addrs_len); |
1317 | 1317 | ||
1318 | if (sctp_sk(ep->base.sk)->hmac) { | 1318 | if (sctp_sk(ep->base.sk)->hmac) { |
1319 | struct hash_desc desc; | 1319 | struct hash_desc desc; |
1320 | 1320 | ||
1321 | /* Sign the message. */ | 1321 | /* Sign the message. */ |
@@ -1324,8 +1324,8 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep, | |||
1324 | sg.length = bodysize; | 1324 | sg.length = bodysize; |
1325 | keylen = SCTP_SECRET_SIZE; | 1325 | keylen = SCTP_SECRET_SIZE; |
1326 | key = (char *)ep->secret_key[ep->current_key]; | 1326 | key = (char *)ep->secret_key[ep->current_key]; |
1327 | desc.tfm = sctp_sk(ep->base.sk)->hmac; | 1327 | desc.tfm = sctp_sk(ep->base.sk)->hmac; |
1328 | desc.flags = 0; | 1328 | desc.flags = 0; |
1329 | 1329 | ||
1330 | if (crypto_hash_setkey(desc.tfm, key, keylen) || | 1330 | if (crypto_hash_setkey(desc.tfm, key, keylen) || |
1331 | crypto_hash_digest(&desc, &sg, bodysize, cookie->signature)) | 1331 | crypto_hash_digest(&desc, &sg, bodysize, cookie->signature)) |
@@ -1365,7 +1365,7 @@ struct sctp_association *sctp_unpack_cookie( | |||
1365 | * any padding. | 1365 | * any padding. |
1366 | */ | 1366 | */ |
1367 | headersize = sizeof(sctp_chunkhdr_t) + | 1367 | headersize = sizeof(sctp_chunkhdr_t) + |
1368 | (sizeof(struct sctp_signed_cookie) - | 1368 | (sizeof(struct sctp_signed_cookie) - |
1369 | sizeof(struct sctp_cookie)); | 1369 | sizeof(struct sctp_cookie)); |
1370 | bodysize = ntohs(chunk->chunk_hdr->length) - headersize; | 1370 | bodysize = ntohs(chunk->chunk_hdr->length) - headersize; |
1371 | fixed_size = headersize + sizeof(struct sctp_cookie); | 1371 | fixed_size = headersize + sizeof(struct sctp_cookie); |
@@ -1593,7 +1593,7 @@ static int sctp_process_inv_paramlength(const struct sctp_association *asoc, | |||
1593 | struct sctp_chunk **errp) | 1593 | struct sctp_chunk **errp) |
1594 | { | 1594 | { |
1595 | char error[] = "The following parameter had invalid length:"; | 1595 | char error[] = "The following parameter had invalid length:"; |
1596 | size_t payload_len = WORD_ROUND(sizeof(error)) + | 1596 | size_t payload_len = WORD_ROUND(sizeof(error)) + |
1597 | sizeof(sctp_paramhdr_t); | 1597 | sizeof(sctp_paramhdr_t); |
1598 | 1598 | ||
1599 | 1599 | ||
@@ -1752,7 +1752,7 @@ static int sctp_verify_param(const struct sctp_association *asoc, | |||
1752 | case SCTP_PARAM_FWD_TSN_SUPPORT: | 1752 | case SCTP_PARAM_FWD_TSN_SUPPORT: |
1753 | if (sctp_prsctp_enable) | 1753 | if (sctp_prsctp_enable) |
1754 | break; | 1754 | break; |
1755 | /* Fall Through */ | 1755 | /* Fall Through */ |
1756 | default: | 1756 | default: |
1757 | SCTP_DEBUG_PRINTK("Unrecognized param: %d for chunk %d.\n", | 1757 | SCTP_DEBUG_PRINTK("Unrecognized param: %d for chunk %d.\n", |
1758 | ntohs(param.p->type), cid); | 1758 | ntohs(param.p->type), cid); |
@@ -1861,7 +1861,7 @@ int sctp_process_init(struct sctp_association *asoc, sctp_cid_t cid, | |||
1861 | sctp_walk_params(param, peer_init, init_hdr.params) { | 1861 | sctp_walk_params(param, peer_init, init_hdr.params) { |
1862 | 1862 | ||
1863 | if (!sctp_process_param(asoc, param, peer_addr, gfp)) | 1863 | if (!sctp_process_param(asoc, param, peer_addr, gfp)) |
1864 | goto clean_up; | 1864 | goto clean_up; |
1865 | } | 1865 | } |
1866 | 1866 | ||
1867 | /* Walk list of transports, removing transports in the UNKNOWN state. */ | 1867 | /* Walk list of transports, removing transports in the UNKNOWN state. */ |
@@ -1937,7 +1937,7 @@ int sctp_process_init(struct sctp_association *asoc, sctp_cid_t cid, | |||
1937 | */ | 1937 | */ |
1938 | 1938 | ||
1939 | /* Allocate storage for the negotiated streams if it is not a temporary | 1939 | /* Allocate storage for the negotiated streams if it is not a temporary |
1940 | * association. | 1940 | * association. |
1941 | */ | 1941 | */ |
1942 | if (!asoc->temp) { | 1942 | if (!asoc->temp) { |
1943 | int assoc_id; | 1943 | int assoc_id; |
@@ -2109,7 +2109,7 @@ static int sctp_process_param(struct sctp_association *asoc, | |||
2109 | asoc->peer.prsctp_capable = 1; | 2109 | asoc->peer.prsctp_capable = 1; |
2110 | break; | 2110 | break; |
2111 | } | 2111 | } |
2112 | /* Fall Through */ | 2112 | /* Fall Through */ |
2113 | default: | 2113 | default: |
2114 | /* Any unrecognized parameters should have been caught | 2114 | /* Any unrecognized parameters should have been caught |
2115 | * and handled by sctp_verify_param() which should be | 2115 | * and handled by sctp_verify_param() which should be |
@@ -2168,7 +2168,7 @@ __u32 sctp_generate_tsn(const struct sctp_endpoint *ep) | |||
2168 | * | ASCONF Parameter #N | | 2168 | * | ASCONF Parameter #N | |
2169 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 2169 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
2170 | * | 2170 | * |
2171 | * Address Parameter and other parameter will not be wrapped in this function | 2171 | * Address Parameter and other parameter will not be wrapped in this function |
2172 | */ | 2172 | */ |
2173 | static struct sctp_chunk *sctp_make_asconf(struct sctp_association *asoc, | 2173 | static struct sctp_chunk *sctp_make_asconf(struct sctp_association *asoc, |
2174 | union sctp_addr *addr, | 2174 | union sctp_addr *addr, |
@@ -2290,7 +2290,7 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc, | |||
2290 | * | Address Parameter | | 2290 | * | Address Parameter | |
2291 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 2291 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
2292 | * | 2292 | * |
2293 | * Create an ASCONF chunk with Set Primary IP address parameter. | 2293 | * Create an ASCONF chunk with Set Primary IP address parameter. |
2294 | */ | 2294 | */ |
2295 | struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc, | 2295 | struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc, |
2296 | union sctp_addr *addr) | 2296 | union sctp_addr *addr) |
@@ -2339,7 +2339,7 @@ struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc, | |||
2339 | * | ASCONF Parameter Response#N | | 2339 | * | ASCONF Parameter Response#N | |
2340 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 2340 | * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
2341 | * | 2341 | * |
2342 | * Create an ASCONF_ACK chunk with enough space for the parameter responses. | 2342 | * Create an ASCONF_ACK chunk with enough space for the parameter responses. |
2343 | */ | 2343 | */ |
2344 | static struct sctp_chunk *sctp_make_asconf_ack(const struct sctp_association *asoc, | 2344 | static struct sctp_chunk *sctp_make_asconf_ack(const struct sctp_association *asoc, |
2345 | __u32 serial, int vparam_len) | 2345 | __u32 serial, int vparam_len) |
@@ -2381,7 +2381,7 @@ static void sctp_add_asconf_response(struct sctp_chunk *chunk, __be32 crr_id, | |||
2381 | ntohs(asconf_param->param_hdr.length); | 2381 | ntohs(asconf_param->param_hdr.length); |
2382 | } | 2382 | } |
2383 | 2383 | ||
2384 | /* Add Success Indication or Error Cause Indication parameter. */ | 2384 | /* Add Success Indication or Error Cause Indication parameter. */ |
2385 | ack_param.param_hdr.type = response_type; | 2385 | ack_param.param_hdr.type = response_type; |
2386 | ack_param.param_hdr.length = htons(sizeof(ack_param) + | 2386 | ack_param.param_hdr.length = htons(sizeof(ack_param) + |
2387 | err_param_len + | 2387 | err_param_len + |
@@ -2424,11 +2424,11 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc, | |||
2424 | switch (asconf_param->param_hdr.type) { | 2424 | switch (asconf_param->param_hdr.type) { |
2425 | case SCTP_PARAM_ADD_IP: | 2425 | case SCTP_PARAM_ADD_IP: |
2426 | /* ADDIP 4.3 D9) If an endpoint receives an ADD IP address | 2426 | /* ADDIP 4.3 D9) If an endpoint receives an ADD IP address |
2427 | * request and does not have the local resources to add this | 2427 | * request and does not have the local resources to add this |
2428 | * new address to the association, it MUST return an Error | 2428 | * new address to the association, it MUST return an Error |
2429 | * Cause TLV set to the new error code 'Operation Refused | 2429 | * Cause TLV set to the new error code 'Operation Refused |
2430 | * Due to Resource Shortage'. | 2430 | * Due to Resource Shortage'. |
2431 | */ | 2431 | */ |
2432 | 2432 | ||
2433 | peer = sctp_assoc_add_peer(asoc, &addr, GFP_ATOMIC, SCTP_UNCONFIRMED); | 2433 | peer = sctp_assoc_add_peer(asoc, &addr, GFP_ATOMIC, SCTP_UNCONFIRMED); |
2434 | if (!peer) | 2434 | if (!peer) |
@@ -2440,10 +2440,10 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc, | |||
2440 | break; | 2440 | break; |
2441 | case SCTP_PARAM_DEL_IP: | 2441 | case SCTP_PARAM_DEL_IP: |
2442 | /* ADDIP 4.3 D7) If a request is received to delete the | 2442 | /* ADDIP 4.3 D7) If a request is received to delete the |
2443 | * last remaining IP address of a peer endpoint, the receiver | 2443 | * last remaining IP address of a peer endpoint, the receiver |
2444 | * MUST send an Error Cause TLV with the error cause set to the | 2444 | * MUST send an Error Cause TLV with the error cause set to the |
2445 | * new error code 'Request to Delete Last Remaining IP Address'. | 2445 | * new error code 'Request to Delete Last Remaining IP Address'. |
2446 | */ | 2446 | */ |
2447 | pos = asoc->peer.transport_addr_list.next; | 2447 | pos = asoc->peer.transport_addr_list.next; |
2448 | if (pos->next == &asoc->peer.transport_addr_list) | 2448 | if (pos->next == &asoc->peer.transport_addr_list) |
2449 | return SCTP_ERROR_DEL_LAST_IP; | 2449 | return SCTP_ERROR_DEL_LAST_IP; |
@@ -2475,7 +2475,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc, | |||
2475 | return SCTP_ERROR_NO_ERROR; | 2475 | return SCTP_ERROR_NO_ERROR; |
2476 | } | 2476 | } |
2477 | 2477 | ||
2478 | /* Process an incoming ASCONF chunk with the next expected serial no. and | 2478 | /* Process an incoming ASCONF chunk with the next expected serial no. and |
2479 | * return an ASCONF_ACK chunk to be sent in response. | 2479 | * return an ASCONF_ACK chunk to be sent in response. |
2480 | */ | 2480 | */ |
2481 | struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc, | 2481 | struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc, |
@@ -2495,19 +2495,19 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc, | |||
2495 | hdr = (sctp_addiphdr_t *)asconf->skb->data; | 2495 | hdr = (sctp_addiphdr_t *)asconf->skb->data; |
2496 | serial = ntohl(hdr->serial); | 2496 | serial = ntohl(hdr->serial); |
2497 | 2497 | ||
2498 | /* Skip the addiphdr and store a pointer to address parameter. */ | 2498 | /* Skip the addiphdr and store a pointer to address parameter. */ |
2499 | length = sizeof(sctp_addiphdr_t); | 2499 | length = sizeof(sctp_addiphdr_t); |
2500 | addr_param = (union sctp_addr_param *)(asconf->skb->data + length); | 2500 | addr_param = (union sctp_addr_param *)(asconf->skb->data + length); |
2501 | chunk_len -= length; | 2501 | chunk_len -= length; |
2502 | 2502 | ||
2503 | /* Skip the address parameter and store a pointer to the first | 2503 | /* Skip the address parameter and store a pointer to the first |
2504 | * asconf paramter. | 2504 | * asconf paramter. |
2505 | */ | 2505 | */ |
2506 | length = ntohs(addr_param->v4.param_hdr.length); | 2506 | length = ntohs(addr_param->v4.param_hdr.length); |
2507 | asconf_param = (sctp_addip_param_t *)((void *)addr_param + length); | 2507 | asconf_param = (sctp_addip_param_t *)((void *)addr_param + length); |
2508 | chunk_len -= length; | 2508 | chunk_len -= length; |
2509 | 2509 | ||
2510 | /* create an ASCONF_ACK chunk. | 2510 | /* create an ASCONF_ACK chunk. |
2511 | * Based on the definitions of parameters, we know that the size of | 2511 | * Based on the definitions of parameters, we know that the size of |
2512 | * ASCONF_ACK parameters are less than or equal to the twice of ASCONF | 2512 | * ASCONF_ACK parameters are less than or equal to the twice of ASCONF |
2513 | * paramters. | 2513 | * paramters. |
@@ -2538,7 +2538,7 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc, | |||
2538 | /* ADDIP 4.3 D11) When an endpoint receiving an ASCONF to add | 2538 | /* ADDIP 4.3 D11) When an endpoint receiving an ASCONF to add |
2539 | * an IP address sends an 'Out of Resource' in its response, it | 2539 | * an IP address sends an 'Out of Resource' in its response, it |
2540 | * MUST also fail any subsequent add or delete requests bundled | 2540 | * MUST also fail any subsequent add or delete requests bundled |
2541 | * in the ASCONF. | 2541 | * in the ASCONF. |
2542 | */ | 2542 | */ |
2543 | if (SCTP_ERROR_RSRC_LOW == err_code) | 2543 | if (SCTP_ERROR_RSRC_LOW == err_code) |
2544 | goto done; | 2544 | goto done; |
@@ -2549,12 +2549,12 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc, | |||
2549 | length); | 2549 | length); |
2550 | chunk_len -= length; | 2550 | chunk_len -= length; |
2551 | } | 2551 | } |
2552 | 2552 | ||
2553 | done: | 2553 | done: |
2554 | asoc->peer.addip_serial++; | 2554 | asoc->peer.addip_serial++; |
2555 | 2555 | ||
2556 | /* If we are sending a new ASCONF_ACK hold a reference to it in assoc | 2556 | /* If we are sending a new ASCONF_ACK hold a reference to it in assoc |
2557 | * after freeing the reference to old asconf ack if any. | 2557 | * after freeing the reference to old asconf ack if any. |
2558 | */ | 2558 | */ |
2559 | if (asconf_ack) { | 2559 | if (asconf_ack) { |
2560 | if (asoc->addip_last_asconf_ack) | 2560 | if (asoc->addip_last_asconf_ack) |
@@ -2622,7 +2622,7 @@ static int sctp_asconf_param_success(struct sctp_association *asoc, | |||
2622 | 2622 | ||
2623 | /* Get the corresponding ASCONF response error code from the ASCONF_ACK chunk | 2623 | /* Get the corresponding ASCONF response error code from the ASCONF_ACK chunk |
2624 | * for the given asconf parameter. If there is no response for this parameter, | 2624 | * for the given asconf parameter. If there is no response for this parameter, |
2625 | * return the error code based on the third argument 'no_err'. | 2625 | * return the error code based on the third argument 'no_err'. |
2626 | * ADDIP 4.1 | 2626 | * ADDIP 4.1 |
2627 | * A7) If an error response is received for a TLV parameter, all TLVs with no | 2627 | * A7) If an error response is received for a TLV parameter, all TLVs with no |
2628 | * response before the failed TLV are considered successful if not reported. | 2628 | * response before the failed TLV are considered successful if not reported. |
@@ -2646,7 +2646,7 @@ static __be16 sctp_get_asconf_response(struct sctp_chunk *asconf_ack, | |||
2646 | 2646 | ||
2647 | /* Skip the addiphdr from the asconf_ack chunk and store a pointer to | 2647 | /* Skip the addiphdr from the asconf_ack chunk and store a pointer to |
2648 | * the first asconf_ack parameter. | 2648 | * the first asconf_ack parameter. |
2649 | */ | 2649 | */ |
2650 | length = sizeof(sctp_addiphdr_t); | 2650 | length = sizeof(sctp_addiphdr_t); |
2651 | asconf_ack_param = (sctp_addip_param_t *)(asconf_ack->skb->data + | 2651 | asconf_ack_param = (sctp_addip_param_t *)(asconf_ack->skb->data + |
2652 | length); | 2652 | length); |
@@ -2697,14 +2697,14 @@ int sctp_process_asconf_ack(struct sctp_association *asoc, | |||
2697 | 2697 | ||
2698 | /* Skip the chunkhdr and addiphdr from the last asconf sent and store | 2698 | /* Skip the chunkhdr and addiphdr from the last asconf sent and store |
2699 | * a pointer to address parameter. | 2699 | * a pointer to address parameter. |
2700 | */ | 2700 | */ |
2701 | length = sizeof(sctp_addip_chunk_t); | 2701 | length = sizeof(sctp_addip_chunk_t); |
2702 | addr_param = (union sctp_addr_param *)(asconf->skb->data + length); | 2702 | addr_param = (union sctp_addr_param *)(asconf->skb->data + length); |
2703 | asconf_len -= length; | 2703 | asconf_len -= length; |
2704 | 2704 | ||
2705 | /* Skip the address parameter in the last asconf sent and store a | 2705 | /* Skip the address parameter in the last asconf sent and store a |
2706 | * pointer to the first asconf paramter. | 2706 | * pointer to the first asconf paramter. |
2707 | */ | 2707 | */ |
2708 | length = ntohs(addr_param->v4.param_hdr.length); | 2708 | length = ntohs(addr_param->v4.param_hdr.length); |
2709 | asconf_param = (sctp_addip_param_t *)((void *)addr_param + length); | 2709 | asconf_param = (sctp_addip_param_t *)((void *)addr_param + length); |
2710 | asconf_len -= length; | 2710 | asconf_len -= length; |
@@ -2741,7 +2741,7 @@ int sctp_process_asconf_ack(struct sctp_association *asoc, | |||
2741 | case SCTP_ERROR_INV_PARAM: | 2741 | case SCTP_ERROR_INV_PARAM: |
2742 | /* Disable sending this type of asconf parameter in | 2742 | /* Disable sending this type of asconf parameter in |
2743 | * future. | 2743 | * future. |
2744 | */ | 2744 | */ |
2745 | asoc->peer.addip_disabled_mask |= | 2745 | asoc->peer.addip_disabled_mask |= |
2746 | asconf_param->param_hdr.type; | 2746 | asconf_param->param_hdr.type; |
2747 | break; | 2747 | break; |
@@ -2755,7 +2755,7 @@ int sctp_process_asconf_ack(struct sctp_association *asoc, | |||
2755 | 2755 | ||
2756 | /* Skip the processed asconf parameter and move to the next | 2756 | /* Skip the processed asconf parameter and move to the next |
2757 | * one. | 2757 | * one. |
2758 | */ | 2758 | */ |
2759 | length = ntohs(asconf_param->param_hdr.length); | 2759 | length = ntohs(asconf_param->param_hdr.length); |
2760 | asconf_param = (sctp_addip_param_t *)((void *)asconf_param + | 2760 | asconf_param = (sctp_addip_param_t *)((void *)asconf_param + |
2761 | length); | 2761 | length); |
@@ -2784,14 +2784,14 @@ int sctp_process_asconf_ack(struct sctp_association *asoc, | |||
2784 | return retval; | 2784 | return retval; |
2785 | } | 2785 | } |
2786 | 2786 | ||
2787 | /* Make a FWD TSN chunk. */ | 2787 | /* Make a FWD TSN chunk. */ |
2788 | struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, | 2788 | struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, |
2789 | __u32 new_cum_tsn, size_t nstreams, | 2789 | __u32 new_cum_tsn, size_t nstreams, |
2790 | struct sctp_fwdtsn_skip *skiplist) | 2790 | struct sctp_fwdtsn_skip *skiplist) |
2791 | { | 2791 | { |
2792 | struct sctp_chunk *retval = NULL; | 2792 | struct sctp_chunk *retval = NULL; |
2793 | struct sctp_fwdtsn_chunk *ftsn_chunk; | 2793 | struct sctp_fwdtsn_chunk *ftsn_chunk; |
2794 | struct sctp_fwdtsn_hdr ftsn_hdr; | 2794 | struct sctp_fwdtsn_hdr ftsn_hdr; |
2795 | struct sctp_fwdtsn_skip skip; | 2795 | struct sctp_fwdtsn_skip skip; |
2796 | size_t hint; | 2796 | size_t hint; |
2797 | int i; | 2797 | int i; |