Skip to content

Commit

Permalink
sctp: remove the typedef sctp_chunks_param_t
Browse files Browse the repository at this point in the history
This patch is to remove the typedef sctp_chunks_param_t, and
replace with struct sctp_chunks_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>
  • Loading branch information
Xin Long authored and David S. Miller committed Jul 17, 2017
1 parent b02db70 commit a762a9d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions include/linux/sctp.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,10 @@ struct sctp_random_param {
};

/* AUTH Section 3.2 Chunk List */
typedef struct sctp_chunks_param {
struct sctp_chunks_param {
struct sctp_paramhdr param_hdr;
__u8 chunks[0];
} sctp_chunks_param_t;
};

/* AUTH Section 3.3 HMAC Algorithm */
typedef struct sctp_hmac_algo_param {
Expand Down
2 changes: 1 addition & 1 deletion include/net/sctp/structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -1557,7 +1557,7 @@ struct sctp_association {
* cookie and these are just pointers to those locations
*/
struct sctp_random_param *peer_random;
sctp_chunks_param_t *peer_chunks;
struct sctp_chunks_param *peer_chunks;
sctp_hmac_algo_param_t *peer_hmacs;
} peer;

Expand Down
4 changes: 2 additions & 2 deletions net/sctp/auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ static int sctp_auth_compare_vectors(struct sctp_auth_bytes *vector1,
*/
static struct sctp_auth_bytes *sctp_auth_make_key_vector(
struct sctp_random_param *random,
sctp_chunks_param_t *chunks,
struct sctp_chunks_param *chunks,
sctp_hmac_algo_param_t *hmacs,
gfp_t gfp)
{
Expand Down Expand Up @@ -227,7 +227,7 @@ static struct sctp_auth_bytes *sctp_auth_make_local_vector(
{
return sctp_auth_make_key_vector(
(struct sctp_random_param *)asoc->c.auth_random,
(sctp_chunks_param_t *)asoc->c.auth_chunks,
(struct sctp_chunks_param *)asoc->c.auth_chunks,
(sctp_hmac_algo_param_t *)asoc->c.auth_hmacs, gfp);
}

Expand Down
4 changes: 2 additions & 2 deletions net/sctp/endpointola.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
if (!auth_hmacs)
goto nomem;

auth_chunks = kzalloc(sizeof(sctp_chunks_param_t) +
SCTP_NUM_CHUNK_TYPES, gfp);
auth_chunks = kzalloc(sizeof(*auth_chunks) +
SCTP_NUM_CHUNK_TYPES, gfp);
if (!auth_chunks)
goto nomem;

Expand Down

0 comments on commit a762a9d

Please sign in to comment.