sctp: remove the typedef sctp_addip_chunk_t

This patch is to remove the typedef sctp_addip_chunk_t, and
replace with struct sctp_addip_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 83dac9b..e7b439e 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -639,10 +639,10 @@ struct sctp_addiphdr {
        __u8    params[0];
 };
 
-typedef struct sctp_addip_chunk {
+struct sctp_addip_chunk {
        struct sctp_chunkhdr chunk_hdr;
        struct sctp_addiphdr addip_hdr;
-} sctp_addip_chunk_t;
+};
 
 /* AUTH
  * Section 4.1  Authentication Chunk (AUTH)

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 41eb2ec..92a0714 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -1111,7 +1111,7 @@ static struct sctp_association *__sctp_rcv_asconf_lookup(
                                        __be16 peer_port,
                                        struct sctp_transport **transportp)
 {
-       sctp_addip_chunk_t *asconf = (struct sctp_addip_chunk *)ch;
+       struct sctp_addip_chunk *asconf = (struct sctp_addip_chunk *)ch;
        struct sctp_af *af;
        union sctp_addr_param *param;
        union sctp_addr paddr;

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 0e71e50..ae54c6e 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -3140,10 +3140,11 @@ bool sctp_verify_asconf(const struct sctp_association *asoc,
                        struct sctp_chunk *chunk, bool addr_param_needed,
                        struct sctp_paramhdr **errp)
 {
-       sctp_addip_chunk_t *addip = (sctp_addip_chunk_t *) chunk->chunk_hdr;
+       struct sctp_addip_chunk *addip;
        union sctp_params param;
        bool addr_param_seen = false;
 
+       addip = (struct sctp_addip_chunk *)chunk->chunk_hdr;
        sctp_walk_params(param, addip, addip_hdr.params) {
                size_t length = ntohs(param.p->length);
 
@@ -3207,7 +3208,7 @@ bool sctp_verify_asconf(const struct sctp_association *asoc,
 struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
                                       struct sctp_chunk *asconf)
 {
-       sctp_addip_chunk_t *addip = (sctp_addip_chunk_t *) asconf->chunk_hdr;
+       struct sctp_addip_chunk *addip;
        bool all_param_pass = true;
        union sctp_params param;
        struct sctp_addiphdr    *hdr;
@@ -3218,6 +3219,7 @@ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
        int     chunk_len;
        __u32   serial;
 
+       addip = (struct sctp_addip_chunk *)asconf->chunk_hdr;
        chunk_len = ntohs(asconf->chunk_hdr->length) -
                    sizeof(struct sctp_chunkhdr);
        hdr = (struct sctp_addiphdr *)asconf->skb->data;
@@ -3419,7 +3421,7 @@ int sctp_process_asconf_ack(struct sctp_association *asoc,
        /* Skip the chunkhdr and addiphdr from the last asconf sent and store
         * a pointer to address parameter.
         */
-       length = sizeof(sctp_addip_chunk_t);
+       length = sizeof(struct sctp_addip_chunk);
        addr_param = (union sctp_addr_param *)(asconf->skb->data + length);
        asconf_len -= length;
 

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index d722f38..9c235bb 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3629,10 +3629,11 @@ sctp_disposition_t sctp_sf_do_asconf(struct net *net,
         * described in [I-D.ietf-tsvwg-sctp-auth].
         */
        if (!net->sctp.addip_noauth && !chunk->auth)
-               return sctp_sf_discard_chunk(net, ep, asoc, type, arg, commands);
+               return sctp_sf_discard_chunk(net, ep, asoc, type, arg,
+                                            commands);
 
        /* Make sure that the ASCONF ADDIP chunk has a valid length.  */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_addip_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_addip_chunk)))
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
 
@@ -3746,10 +3747,12 @@ sctp_disposition_t sctp_sf_do_asconf_ack(struct net *net,
         * described in [I-D.ietf-tsvwg-sctp-auth].
         */
        if (!net->sctp.addip_noauth && !asconf_ack->auth)
-               return sctp_sf_discard_chunk(net, ep, asoc, type, arg, commands);
+               return sctp_sf_discard_chunk(net, ep, asoc, type, arg,
+                                            commands);
 
        /* Make sure that the ADDIP chunk has a valid length.  */
-       if (!sctp_chunk_length_valid(asconf_ack, sizeof(sctp_addip_chunk_t)))
+       if (!sctp_chunk_length_valid(asconf_ack,
+                                    sizeof(struct sctp_addip_chunk)))
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);