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>

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index b52def9bcfa14231438cabd2af1b2ce15edaa376..913474dfc96c4723fae79dae803ce7540e34f95b 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -327,10 +327,10 @@ struct sctp_chunks_param {
 };
 
 /* AUTH Section 3.3 HMAC Algorithm */
-typedef struct sctp_hmac_algo_param {
+struct sctp_hmac_algo_param {
        struct sctp_paramhdr param_hdr;
        __be16 hmac_ids[0];
-} sctp_hmac_algo_param_t;
+};
 
 /* RFC 2960.  Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
  *   The INIT ACK chunk is used to acknowledge the initiation of an SCTP

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 8042e6380b0e9bf853cf2e3e686a5c0eba198945..66cd7639b9123d84103ac6739908fc9285678034 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1558,7 +1558,7 @@ struct sctp_association {
                 */
                struct sctp_random_param *peer_random;
                struct sctp_chunks_param *peer_chunks;
-               sctp_hmac_algo_param_t *peer_hmacs;
+               struct sctp_hmac_algo_param *peer_hmacs;
        } peer;
 
        /* State       : A state variable indicating what state the

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 367994d9712a7d06514a4b43bd678a7d8a7fb7d1..00667c50efa7abdc45dc0635ec59cc8e70878e54 100644 (file)
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -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(
                        struct sctp_random_param *random,
                        struct sctp_chunks_param *chunks,
-                       sctp_hmac_algo_param_t *hmacs,
+                       struct sctp_hmac_algo_param *hmacs,
                        gfp_t gfp)
 {
        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(
                        (struct sctp_random_param *)asoc->c.auth_random,
                        (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 */

diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 35bf5af124fc148a544c0dd9bdde7981390500f4..3d506b2f619343f5b7ebf1c6f5d824b2bab0d0a7 100644 (file)
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -73,8 +73,8 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
                 * variables.  There are arrays that we encode directly
                 * into parameters to make the rest of the operations easier.
                 */
-               auth_hmacs = kzalloc(sizeof(sctp_hmac_algo_param_t) +
-                               sizeof(__u16) * SCTP_AUTH_NUM_HMACS, gfp);
+               auth_hmacs = kzalloc(sizeof(*auth_hmacs) +
+                                    sizeof(__u16) * SCTP_AUTH_NUM_HMACS, gfp);
                if (!auth_hmacs)
                        goto nomem;