sctp: remove the typedef sctp_random_param_t

This patch is to remove the typedef sctp_random_param_t, and
replace with struct sctp_random_param in the places where it's
using this typedef.

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 76245685f92372caf787b94b309f7b1d9c7a2030..9b1aa3907c9e6ce07667acabe10f0b2b958c8a8c 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -315,10 +315,10 @@ struct sctp_supported_ext_param {
 };
 
 /* AUTH Section 3.1 Random */
-typedef struct sctp_random_param {
+struct sctp_random_param {
        struct sctp_paramhdr param_hdr;
        __u8 random_val[0];
-} sctp_random_param_t;
+};
 
 /* AUTH Section 3.2 Chunk List */
 typedef struct sctp_chunks_param {

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 5ab29af8ca8acbdb80c94e4a07c23fac64a22526..f22c079fd1f13ee8cb4727540e1000665d5d4daa 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1556,7 +1556,7 @@ struct sctp_association {
                 * and authenticated chunk list.  All that is part of the
                 * cookie and these are just pointers to those locations
                 */
-               sctp_random_param_t *peer_random;
+               struct sctp_random_param *peer_random;
                sctp_chunks_param_t *peer_chunks;
                sctp_hmac_algo_param_t *peer_hmacs;
        } peer;

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index e001b01b0e68dffc088a72b1af1eecc2048e95fd..0d9c63eba978cf83518d82595548e239516a3de5 100644 (file)
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -185,7 +185,7 @@ static int sctp_auth_compare_vectors(struct sctp_auth_bytes *vector1,
  *    are called the two key vectors.
  */
 static struct sctp_auth_bytes *sctp_auth_make_key_vector(
-                       sctp_random_param_t *random,
+                       struct sctp_random_param *random,
                        sctp_chunks_param_t *chunks,
                        sctp_hmac_algo_param_t *hmacs,
                        gfp_t gfp)
@@ -226,10 +226,9 @@ static struct sctp_auth_bytes *sctp_auth_make_local_vector(
                                    gfp_t gfp)
 {
        return sctp_auth_make_key_vector(
-                                   (sctp_random_param_t *)asoc->c.auth_random,
-                                   (sctp_chunks_param_t *)asoc->c.auth_chunks,
-                                   (sctp_hmac_algo_param_t *)asoc->c.auth_hmacs,
-                                   gfp);
+                       (struct sctp_random_param *)asoc->c.auth_random,
+                       (sctp_chunks_param_t *)asoc->c.auth_chunks,
+                       (sctp_hmac_algo_param_t *)asoc->c.auth_hmacs, gfp);
 }
 
 /* Make a key vector based on peer's parameters */