sctp: remove the typedef sctp_hmac_algo_param_t
This patch is to remove the typedef sctp_hmac_algo_param_t, and replace with struct sctp_hmac_algo_param in the places where it's using this typedef. It is also to use sizeof(variable) instead of sizeof(type). Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a762a9d94d
commit
1474774a7f
|
@ -327,10 +327,10 @@ struct sctp_chunks_param {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* AUTH Section 3.3 HMAC Algorithm */
|
/* AUTH Section 3.3 HMAC Algorithm */
|
||||||
typedef struct sctp_hmac_algo_param {
|
struct sctp_hmac_algo_param {
|
||||||
struct sctp_paramhdr param_hdr;
|
struct sctp_paramhdr param_hdr;
|
||||||
__be16 hmac_ids[0];
|
__be16 hmac_ids[0];
|
||||||
} sctp_hmac_algo_param_t;
|
};
|
||||||
|
|
||||||
/* RFC 2960. Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
|
/* RFC 2960. Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
|
||||||
* The INIT ACK chunk is used to acknowledge the initiation of an SCTP
|
* The INIT ACK chunk is used to acknowledge the initiation of an SCTP
|
||||||
|
|
|
@ -1558,7 +1558,7 @@ struct sctp_association {
|
||||||
*/
|
*/
|
||||||
struct sctp_random_param *peer_random;
|
struct sctp_random_param *peer_random;
|
||||||
struct sctp_chunks_param *peer_chunks;
|
struct sctp_chunks_param *peer_chunks;
|
||||||
sctp_hmac_algo_param_t *peer_hmacs;
|
struct sctp_hmac_algo_param *peer_hmacs;
|
||||||
} peer;
|
} peer;
|
||||||
|
|
||||||
/* State : A state variable indicating what state the
|
/* State : A state variable indicating what state the
|
||||||
|
|
|
@ -187,7 +187,7 @@ static int sctp_auth_compare_vectors(struct sctp_auth_bytes *vector1,
|
||||||
static struct sctp_auth_bytes *sctp_auth_make_key_vector(
|
static struct sctp_auth_bytes *sctp_auth_make_key_vector(
|
||||||
struct sctp_random_param *random,
|
struct sctp_random_param *random,
|
||||||
struct sctp_chunks_param *chunks,
|
struct sctp_chunks_param *chunks,
|
||||||
sctp_hmac_algo_param_t *hmacs,
|
struct sctp_hmac_algo_param *hmacs,
|
||||||
gfp_t gfp)
|
gfp_t gfp)
|
||||||
{
|
{
|
||||||
struct sctp_auth_bytes *new;
|
struct sctp_auth_bytes *new;
|
||||||
|
@ -228,7 +228,7 @@ static struct sctp_auth_bytes *sctp_auth_make_local_vector(
|
||||||
return sctp_auth_make_key_vector(
|
return sctp_auth_make_key_vector(
|
||||||
(struct sctp_random_param *)asoc->c.auth_random,
|
(struct sctp_random_param *)asoc->c.auth_random,
|
||||||
(struct sctp_chunks_param *)asoc->c.auth_chunks,
|
(struct sctp_chunks_param *)asoc->c.auth_chunks,
|
||||||
(sctp_hmac_algo_param_t *)asoc->c.auth_hmacs, gfp);
|
(struct sctp_hmac_algo_param *)asoc->c.auth_hmacs, gfp);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make a key vector based on peer's parameters */
|
/* Make a key vector based on peer's parameters */
|
||||||
|
|
|
@ -73,8 +73,8 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
|
||||||
* variables. There are arrays that we encode directly
|
* variables. There are arrays that we encode directly
|
||||||
* into parameters to make the rest of the operations easier.
|
* into parameters to make the rest of the operations easier.
|
||||||
*/
|
*/
|
||||||
auth_hmacs = kzalloc(sizeof(sctp_hmac_algo_param_t) +
|
auth_hmacs = kzalloc(sizeof(*auth_hmacs) +
|
||||||
sizeof(__u16) * SCTP_AUTH_NUM_HMACS, gfp);
|
sizeof(__u16) * SCTP_AUTH_NUM_HMACS, gfp);
|
||||||
if (!auth_hmacs)
|
if (!auth_hmacs)
|
||||||
goto nomem;
|
goto nomem;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue