sctp: remove the typedef sctp_cookie_param_t

This patch is to remove the typedef sctp_cookie_param_t, and
replace with struct sctp_cookie_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 05c2099be537def054f67b5bd9f71d8ca27dcd07..9e77abda2111d697f55cbef3fbca97060aee56b8 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -342,10 +342,10 @@ struct sctp_initack_chunk {
 };
 
 /* Section 3.3.3.1 State Cookie (7) */
-typedef struct sctp_cookie_param {
+struct sctp_cookie_param {
        struct sctp_paramhdr p;
        __u8 body[0];
-} sctp_cookie_param_t;
+};
 
 /* Section 3.3.3.1 Unrecognized Parameters (8) */
 typedef struct sctp_unrecognized_param {

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 0b36e96cb0dfae362aa6f2b8a2c90e3fcc2a6513..163004e7047c86c902cb0a4a0dec79cba3a0958e 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -69,7 +69,8 @@ static struct sctp_chunk *sctp_make_data(const struct sctp_association *asoc,
 static struct sctp_chunk *_sctp_make_chunk(const struct sctp_association *asoc,
                                           __u8 type, __u8 flags, int paylen,
                                           gfp_t gfp);
-static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
+static struct sctp_cookie_param *sctp_pack_cookie(
+                                       const struct sctp_endpoint *ep,
                                        const struct sctp_association *asoc,
                                        const struct sctp_chunk *init_chunk,
                                        int *cookie_len,
@@ -387,7 +388,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
        union sctp_params addrs;
        struct sctp_sock *sp;
        int addrs_len;
-       sctp_cookie_param_t *cookie;
+       struct sctp_cookie_param *cookie;
        int cookie_len;
        size_t chunksize;
        struct sctp_adaptation_ind_param aiparam;
@@ -1595,14 +1596,15 @@ nodata:
 /* Build a cookie representing asoc.
  * This INCLUDES the param header needed to put the cookie in the INIT ACK.
  */
-static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
-                                     const struct sctp_association *asoc,
-                                     const struct sctp_chunk *init_chunk,
-                                     int *cookie_len,
-                                     const __u8 *raw_addrs, int addrs_len)
+static struct sctp_cookie_param *sctp_pack_cookie(
+                                       const struct sctp_endpoint *ep,
+                                       const struct sctp_association *asoc,
+                                       const struct sctp_chunk *init_chunk,
+                                       int *cookie_len,
+                                       const __u8 *raw_addrs, int addrs_len)
 {
-       sctp_cookie_param_t *retval;
        struct sctp_signed_cookie *cookie;
+       struct sctp_cookie_param *retval;
        int headersize, bodysize;
 
        /* Header size is static data prior to the actual cookie, including