|
@@ -226,7 +226,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
|
|
|
struct sctp_supported_addrs_param sat;
|
|
|
__be16 types[2];
|
|
|
struct sctp_adaptation_ind_param aiparam;
|
|
|
- sctp_supported_ext_param_t ext_param;
|
|
|
+ struct sctp_supported_ext_param ext_param;
|
|
|
int num_ext = 0;
|
|
|
__u8 extensions[3];
|
|
|
struct sctp_paramhdr *auth_chunks = NULL,
|
|
@@ -305,8 +305,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
|
|
|
|
|
|
/* If we have any extensions to report, account for that */
|
|
|
if (num_ext)
|
|
|
- chunksize += SCTP_PAD4(sizeof(sctp_supported_ext_param_t) +
|
|
|
- num_ext);
|
|
|
+ chunksize += SCTP_PAD4(sizeof(ext_param) + num_ext);
|
|
|
|
|
|
/* RFC 2960 3.3.2 Initiation (INIT) (1)
|
|
|
*
|
|
@@ -348,10 +347,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
|
|
|
*/
|
|
|
if (num_ext) {
|
|
|
ext_param.param_hdr.type = SCTP_PARAM_SUPPORTED_EXT;
|
|
|
- ext_param.param_hdr.length =
|
|
|
- htons(sizeof(sctp_supported_ext_param_t) + num_ext);
|
|
|
- sctp_addto_chunk(retval, sizeof(sctp_supported_ext_param_t),
|
|
|
- &ext_param);
|
|
|
+ ext_param.param_hdr.length = htons(sizeof(ext_param) + num_ext);
|
|
|
+ sctp_addto_chunk(retval, sizeof(ext_param), &ext_param);
|
|
|
sctp_addto_param(retval, num_ext, extensions);
|
|
|
}
|
|
|
|
|
@@ -394,7 +391,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
|
|
|
int cookie_len;
|
|
|
size_t chunksize;
|
|
|
struct sctp_adaptation_ind_param aiparam;
|
|
|
- sctp_supported_ext_param_t ext_param;
|
|
|
+ struct sctp_supported_ext_param ext_param;
|
|
|
int num_ext = 0;
|
|
|
__u8 extensions[3];
|
|
|
struct sctp_paramhdr *auth_chunks = NULL,
|
|
@@ -468,8 +465,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
|
|
|
}
|
|
|
|
|
|
if (num_ext)
|
|
|
- chunksize += SCTP_PAD4(sizeof(sctp_supported_ext_param_t) +
|
|
|
- num_ext);
|
|
|
+ chunksize += SCTP_PAD4(sizeof(ext_param) + num_ext);
|
|
|
|
|
|
/* Now allocate and fill out the chunk. */
|
|
|
retval = sctp_make_control(asoc, SCTP_CID_INIT_ACK, 0, chunksize, gfp);
|
|
@@ -495,10 +491,8 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
|
|
|
sctp_addto_chunk(retval, sizeof(ecap_param), &ecap_param);
|
|
|
if (num_ext) {
|
|
|
ext_param.param_hdr.type = SCTP_PARAM_SUPPORTED_EXT;
|
|
|
- ext_param.param_hdr.length =
|
|
|
- htons(sizeof(sctp_supported_ext_param_t) + num_ext);
|
|
|
- sctp_addto_chunk(retval, sizeof(sctp_supported_ext_param_t),
|
|
|
- &ext_param);
|
|
|
+ ext_param.param_hdr.length = htons(sizeof(ext_param) + num_ext);
|
|
|
+ sctp_addto_chunk(retval, sizeof(ext_param), &ext_param);
|
|
|
sctp_addto_param(retval, num_ext, extensions);
|
|
|
}
|
|
|
if (asoc->peer.prsctp_capable)
|