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 9b1aa3907c9e6ce07667acabe10f0b2b958c8a8c..b52def9bcfa14231438cabd2af1b2ce15edaa376 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 f22c079fd1f13ee8cb4727540e1000665d5d4daa..8042e6380b0e9bf853cf2e3e686a5c0eba198945 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 0d9c63eba978cf83518d82595548e239516a3de5..367994d9712a7d06514a4b43bd678a7d8a7fb7d1 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 0e86f988f83621caaea34b3aa63772e2ec0ee7ca..35bf5af124fc148a544c0dd9bdde7981390500f4 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;