sctp: remove the typedef sctp_init_chunk_t

This patch is to remove the typedef sctp_init_chunk_t, and replace
with struct sctp_init_chunk 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 56241953e57e2d96e9f2a5b6a28ebac9d2133b84..99e866487e2f5cea6311b1617afe115c94da00f5 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -266,10 +266,10 @@ struct sctp_inithdr {
        __u8  params[0];
 };
 
-typedef struct sctp_init_chunk {
+struct sctp_init_chunk {
        struct sctp_chunkhdr chunk_hdr;
        struct sctp_inithdr init_hdr;
-} sctp_init_chunk_t;
+};
 
 
 /* Section 3.3.2.1. IPv4 Address Parameter (5) */
@@ -341,7 +341,7 @@ typedef struct sctp_hmac_algo_param {
  *   The INIT ACK chunk is used to acknowledge the initiation of an SCTP
  *   association.
  */
-typedef sctp_init_chunk_t sctp_initack_chunk_t;
+typedef struct sctp_init_chunk sctp_initack_chunk_t;
 
 /* Section 3.3.3.1 State Cookie (7) */
 typedef struct sctp_cookie_param {

diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index d4a20d00461cff61767c7e4d0aaae1b2c05bfa4e..d4679e7a5ed580d2735e90b1e5089e9ee1f3b1d1 100644 (file)
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -132,7 +132,7 @@ typedef union {
        struct sctp_association *asoc;
        struct sctp_transport *transport;
        struct sctp_bind_addr *bp;
-       sctp_init_chunk_t *init;
+       struct sctp_init_chunk *init;
        struct sctp_ulpevent *ulpevent;
        struct sctp_packet *packet;
        sctp_sackhdr_t *sackh;
@@ -173,7 +173,7 @@ SCTP_ARG_CONSTRUCTOR(CHUNK, struct sctp_chunk *, chunk)
 SCTP_ARG_CONSTRUCTOR(ASOC,     struct sctp_association *, asoc)
 SCTP_ARG_CONSTRUCTOR(TRANSPORT,        struct sctp_transport *, transport)
 SCTP_ARG_CONSTRUCTOR(BA,       struct sctp_bind_addr *, bp)
-SCTP_ARG_CONSTRUCTOR(PEER_INIT,        sctp_init_chunk_t *, init)
+SCTP_ARG_CONSTRUCTOR(PEER_INIT,        struct sctp_init_chunk *, init)
 SCTP_ARG_CONSTRUCTOR(ULPEVENT,  struct sctp_ulpevent *, ulpevent)
 SCTP_ARG_CONSTRUCTOR(PACKET,   struct sctp_packet *, packet)
 SCTP_ARG_CONSTRUCTOR(SACKH,    sctp_sackhdr_t *, sackh)

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 2393d2ee95c18c70196a1aa52303c8d46efbc4d9..07c11fefa8c49fee9d9b5a668241b14a3fdf6058 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -1298,11 +1298,11 @@ int sctp_has_association(struct net *net, const union sctp_addr *laddr,
 
 int sctp_verify_init(struct net *net, const struct sctp_endpoint *ep,
                     const struct sctp_association *asoc,
-                    enum sctp_cid cid, sctp_init_chunk_t *peer_init,
+                    enum sctp_cid cid, struct sctp_init_chunk *peer_init,
                     struct sctp_chunk *chunk, struct sctp_chunk **err_chunk);
 int sctp_process_init(struct sctp_association *, struct sctp_chunk *chunk,
                      const union sctp_addr *peer,
-                     sctp_init_chunk_t *init, gfp_t gfp);
+                     struct sctp_init_chunk *init, gfp_t gfp);
 __u32 sctp_generate_tag(const struct sctp_endpoint *);
 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
 

diff --git a/net/sctp/input.c b/net/sctp/input.c
index a9994c4afc1867fbba03d9ff494180b945fe6d38..41eb2ec104601eb0fc9ae37851248752884992b2 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -1051,7 +1051,7 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net,
        union sctp_addr *paddr = &addr;
        struct sctphdr *sh = sctp_hdr(skb);
        union sctp_params params;
-       sctp_init_chunk_t *init;
+       struct sctp_init_chunk *init;
        struct sctp_af *af;
 
        /*
@@ -1070,7 +1070,7 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct net *net,
        /* Find the start of the TLVs and the end of the chunk.  This is
         * the region we search for address parameters.
         */
-       init = (sctp_init_chunk_t *)skb->data;
+       init = (struct sctp_init_chunk *)skb->data;
 
        /* Walk the parameters looking for embedded addresses. */
        sctp_walk_params(params, init, init_hdr.params) {

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 8b9ca107fd0cb729cfc740d8489a0f6ca1c06969..3af4dd024ec00abd095e3b9a0367aeb61aa13e9e 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -2242,8 +2242,8 @@ fallthrough:
 /* Verify the INIT packet before we process it.  */
 int sctp_verify_init(struct net *net, const struct sctp_endpoint *ep,
                     const struct sctp_association *asoc, enum sctp_cid cid,
-                    sctp_init_chunk_t *peer_init, struct sctp_chunk *chunk,
-                    struct sctp_chunk **errp)
+                    struct sctp_init_chunk *peer_init,
+                    struct sctp_chunk *chunk, struct sctp_chunk **errp)
 {
        union sctp_params param;
        bool has_cookie = false;
@@ -2307,7 +2307,7 @@ int sctp_verify_init(struct net *net, const struct sctp_endpoint *ep,
  */
 int sctp_process_init(struct sctp_association *asoc, struct sctp_chunk *chunk,
                      const union sctp_addr *peer_addr,
-                     sctp_init_chunk_t *peer_init, gfp_t gfp)
+                     struct sctp_init_chunk *peer_init, gfp_t gfp)
 {
        struct net *net = sock_net(asoc->base.sk);
        union sctp_params param;

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index b255339f22a3f6115cc6c356658c809610a691a7..d6e5e9e0fd6d429640e411f55b7d5ed94f6f3781 100644 (file)
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -647,7 +647,7 @@ static void sctp_cmd_assoc_failed(sctp_cmd_seq_t *commands,
 static int sctp_cmd_process_init(sctp_cmd_seq_t *commands,
                                 struct sctp_association *asoc,
                                 struct sctp_chunk *chunk,
-                                sctp_init_chunk_t *peer_init,
+                                struct sctp_init_chunk *peer_init,
                                 gfp_t gfp)
 {
        int error;

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 71b6e3f66b65a82379d784d882e409548b21c76f..b2a74c3823eea7e82a11d2812f0e235748274e7f 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -345,7 +345,7 @@ sctp_disposition_t sctp_sf_do_5_1B_init(struct net *net,
         * error, but since we don't have an association, we'll
         * just discard the packet.
         */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_init_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_init_chunk)))
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
 
        /* If the INIT is coming toward a closing socket, we'll send back
@@ -360,7 +360,7 @@ sctp_disposition_t sctp_sf_do_5_1B_init(struct net *net,
        /* Verify the INIT chunk before processing it. */
        err_chunk = NULL;
        if (!sctp_verify_init(net, ep, asoc, chunk->chunk_hdr->type,
-                             (sctp_init_chunk_t *)chunk->chunk_hdr, chunk,
+                             (struct sctp_init_chunk *)chunk->chunk_hdr, chunk,
                              &err_chunk)) {
                /* This chunk contains fatal error. It is to be discarded.
                 * Send an ABORT, with causes if there is any.
@@ -405,7 +405,7 @@ sctp_disposition_t sctp_sf_do_5_1B_init(struct net *net,
 
        /* The call, sctp_process_init(), can fail on memory allocation.  */
        if (!sctp_process_init(new_asoc, chunk, sctp_source(chunk),
-                              (sctp_init_chunk_t *)chunk->chunk_hdr,
+                              (struct sctp_init_chunk *)chunk->chunk_hdr,
                               GFP_ATOMIC))
                goto nomem_init;
 
@@ -503,7 +503,7 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(struct net *net,
                                       sctp_cmd_seq_t *commands)
 {
        struct sctp_chunk *chunk = arg;
-       sctp_init_chunk_t *initchunk;
+       struct sctp_init_chunk *initchunk;
        struct sctp_chunk *err_chunk;
        struct sctp_packet *packet;
 
@@ -527,7 +527,7 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(struct net *net,
        /* Verify the INIT chunk before processing it. */
        err_chunk = NULL;
        if (!sctp_verify_init(net, ep, asoc, chunk->chunk_hdr->type,
-                             (sctp_init_chunk_t *)chunk->chunk_hdr, chunk,
+                             (struct sctp_init_chunk *)chunk->chunk_hdr, chunk,
                              &err_chunk)) {
 
                sctp_error_t error = SCTP_ERROR_NO_RESOURCE;
@@ -578,7 +578,7 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(struct net *net,
         */
        chunk->param_hdr.v = skb_pull(chunk->skb, sizeof(struct sctp_inithdr));
 
-       initchunk = (sctp_init_chunk_t *) chunk->chunk_hdr;
+       initchunk = (struct sctp_init_chunk *)chunk->chunk_hdr;
 
        sctp_add_cmd_sf(commands, SCTP_CMD_PEER_INIT,
                        SCTP_PEER_INIT(initchunk));
@@ -653,7 +653,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(struct net *net,
 {
        struct sctp_chunk *chunk = arg;
        struct sctp_association *new_asoc;
-       sctp_init_chunk_t *peer_init;
+       struct sctp_init_chunk *peer_init;
        struct sctp_chunk *repl;
        struct sctp_ulpevent *ev, *ai_ev = NULL;
        int error = 0;
@@ -1450,7 +1450,7 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
         * In this case, we generate a protocol violation since we have
         * an association established.
         */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_init_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_init_chunk)))
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
        /* Grab the INIT header.  */
@@ -1462,7 +1462,7 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
        /* Verify the INIT chunk before processing it. */
        err_chunk = NULL;
        if (!sctp_verify_init(net, ep, asoc, chunk->chunk_hdr->type,
-                             (sctp_init_chunk_t *)chunk->chunk_hdr, chunk,
+                             (struct sctp_init_chunk *)chunk->chunk_hdr, chunk,
                              &err_chunk)) {
                /* This chunk contains fatal error. It is to be discarded.
                 * Send an ABORT, with causes if there is any.
@@ -1509,7 +1509,7 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
         * place (local tie-tag and per tie-tag) within the state cookie.
         */
        if (!sctp_process_init(new_asoc, chunk, sctp_source(chunk),
-                              (sctp_init_chunk_t *)chunk->chunk_hdr,
+                              (struct sctp_init_chunk *)chunk->chunk_hdr,
                               GFP_ATOMIC))
                goto nomem;
 
@@ -1730,7 +1730,7 @@ static sctp_disposition_t sctp_sf_do_dupcook_a(struct net *net,
                                        sctp_cmd_seq_t *commands,
                                        struct sctp_association *new_asoc)
 {
-       sctp_init_chunk_t *peer_init;
+       struct sctp_init_chunk *peer_init;
        struct sctp_ulpevent *ev;
        struct sctp_chunk *repl;
        struct sctp_chunk *err;
@@ -1845,7 +1845,7 @@ static sctp_disposition_t sctp_sf_do_dupcook_b(struct net *net,
                                        sctp_cmd_seq_t *commands,
                                        struct sctp_association *new_asoc)
 {
-       sctp_init_chunk_t *peer_init;
+       struct sctp_init_chunk *peer_init;
        struct sctp_chunk *repl;
 
        /* new_asoc is a brand-new association, so these are not yet
@@ -6124,9 +6124,9 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net,
                switch (chunk->chunk_hdr->type) {
                case SCTP_CID_INIT:
                {
-                       sctp_init_chunk_t *init;
+                       struct sctp_init_chunk *init;
 
-                       init = (sctp_init_chunk_t *)chunk->chunk_hdr;
+                       init = (struct sctp_init_chunk *)chunk->chunk_hdr;
                        vtag = ntohl(init->init_hdr.init_tag);
                        break;
                }