sctp: remove the typedef sctp_chunks_param_t

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>

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 9b1aa39..b52def9 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -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 {

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index f22c079..8042e63 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -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;
 

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 0d9c63e..367994d 100644 (file)
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -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)
 {
@@ -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);
 }
 

diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 0e86f98..35bf5af 100644 (file)
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -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;