sctp: remove the typedef sctp_inithdr_t

This patch is to remove the typedef sctp_inithdr_t, and replace
with struct sctp_inithdr 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 91c888f..5624195 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -257,18 +257,18 @@ enum { SCTP_DATA_FRAG_MASK = 0x03, };
  *  This chunk is used to initiate a SCTP association between two
  *  endpoints.
  */
-typedef struct sctp_inithdr {
+struct sctp_inithdr {
        __be32 init_tag;
        __be32 a_rwnd;
        __be16 num_outbound_streams;
        __be16 num_inbound_streams;
        __be32 initial_tsn;
        __u8  params[0];
-} sctp_inithdr_t;
+};
 
 typedef struct sctp_init_chunk {
        struct sctp_chunkhdr chunk_hdr;
-       sctp_inithdr_t init_hdr;
+       struct sctp_inithdr init_hdr;
 } sctp_init_chunk_t;
 
 

diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index b841a8a..31c6c8e 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -395,7 +395,7 @@ static int sctp_packet(struct nf_conn *ct,
                /* If it is an INIT or an INIT ACK note down the vtag */
                if (sch->type == SCTP_CID_INIT ||
                    sch->type == SCTP_CID_INIT_ACK) {
-                       sctp_inithdr_t _inithdr, *ih;
+                       struct sctp_inithdr _inithdr, *ih;
 
                        ih = skb_header_pointer(skb, offset + sizeof(_sch),
                                                sizeof(_inithdr), &_inithdr);
@@ -471,7 +471,7 @@ static bool sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
 
                /* Copy the vtag into the state info */
                if (sch->type == SCTP_CID_INIT) {
-                       sctp_inithdr_t _inithdr, *ih;
+                       struct sctp_inithdr _inithdr, *ih;
                        /* Sec 8.5.1 (A) */
                        if (sh->vtag)
                                return false;

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 3ed2108..8b9ca10 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -217,7 +217,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,
 {
        struct net *net = sock_net(asoc->base.sk);
        struct sctp_endpoint *ep = asoc->ep;
-       sctp_inithdr_t init;
+       struct sctp_inithdr init;
        union sctp_params addrs;
        size_t chunksize;
        struct sctp_chunk *retval = NULL;
@@ -385,7 +385,7 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc,
                                 const struct sctp_chunk *chunk,
                                 gfp_t gfp, int unkparam_len)
 {
-       sctp_inithdr_t initack;
+       struct sctp_inithdr initack;
        struct sctp_chunk *retval;
        union sctp_params addrs;
        struct sctp_sock *sp;

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 212fe76..71b6e3f 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -389,10 +389,10 @@ sctp_disposition_t sctp_sf_do_5_1B_init(struct net *net,
        }
 
        /* Grab the INIT header.  */
-       chunk->subh.init_hdr = (sctp_inithdr_t *)chunk->skb->data;
+       chunk->subh.init_hdr = (struct sctp_inithdr *)chunk->skb->data;
 
        /* Tag the variable length parameters.  */
-       chunk->param_hdr.v = skb_pull(chunk->skb, sizeof(sctp_inithdr_t));
+       chunk->param_hdr.v = skb_pull(chunk->skb, sizeof(struct sctp_inithdr));
 
        new_asoc = sctp_make_temp_asoc(ep, chunk, GFP_ATOMIC);
        if (!new_asoc)
@@ -522,7 +522,7 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(struct net *net,
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
        /* Grab the INIT header.  */
-       chunk->subh.init_hdr = (sctp_inithdr_t *) chunk->skb->data;
+       chunk->subh.init_hdr = (struct sctp_inithdr *)chunk->skb->data;
 
        /* Verify the INIT chunk before processing it. */
        err_chunk = NULL;
@@ -576,7 +576,7 @@ sctp_disposition_t sctp_sf_do_5_1C_ack(struct net *net,
        /* Tag the variable length parameters.  Note that we never
         * convert the parameters in an INIT chunk.
         */
-       chunk->param_hdr.v = skb_pull(chunk->skb, sizeof(sctp_inithdr_t));
+       chunk->param_hdr.v = skb_pull(chunk->skb, sizeof(struct sctp_inithdr));
 
        initchunk = (sctp_init_chunk_t *) chunk->chunk_hdr;
 
@@ -1454,10 +1454,10 @@ static sctp_disposition_t sctp_sf_do_unexpected_init(
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
        /* Grab the INIT header.  */
-       chunk->subh.init_hdr = (sctp_inithdr_t *) chunk->skb->data;
+       chunk->subh.init_hdr = (struct sctp_inithdr *)chunk->skb->data;
 
        /* Tag the variable length parameters.  */
-       chunk->param_hdr.v = skb_pull(chunk->skb, sizeof(sctp_inithdr_t));
+       chunk->param_hdr.v = skb_pull(chunk->skb, sizeof(struct sctp_inithdr));
 
        /* Verify the INIT chunk before processing it. */
        err_chunk = NULL;