sctp: remove the typedef sctp_shutdownhdr_t

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

It is also to use sizeof(variable) instead of sizeof(type).

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 ba007163acfd1427f30fd0edf285a0e52f4e1e1d..7a586ba7dcd4388876087b9206bfdb21565b67e8 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -416,13 +416,13 @@ struct sctp_abort_chunk {
 /* For the graceful shutdown we must carry the tag (in common header)
  * and the highest consecutive acking value.
  */
-typedef struct sctp_shutdownhdr {
+struct sctp_shutdownhdr {
        __be32 cum_tsn_ack;
-} sctp_shutdownhdr_t;
+};
 
 struct sctp_shutdown_chunk_t {
        struct sctp_chunkhdr chunk_hdr;
-       sctp_shutdownhdr_t shutdown_hdr;
+       struct sctp_shutdownhdr shutdown_hdr;
 };
 
 /* RFC 2960.  Section 3.3.10 Operation Error (ERROR) (9) */

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 163004e7047c86c902cb0a4a0dec79cba3a0958e..8f1c6b639ac126374f1e0552dfb4e4af01834cf4 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -857,15 +857,15 @@ nodata:
 struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc,
                                      const struct sctp_chunk *chunk)
 {
+       struct sctp_shutdownhdr shut;
        struct sctp_chunk *retval;
-       sctp_shutdownhdr_t shut;
        __u32 ctsn;
 
        ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
        shut.cum_tsn_ack = htonl(ctsn);
 
        retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0,
-                                  sizeof(sctp_shutdownhdr_t), GFP_ATOMIC);
+                                  sizeof(shut), GFP_ATOMIC);
        if (!retval)
                goto nodata;
 

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index dc0c2c4188d8a575d2c5c403b0353aa5fc764a35..5b95e2d8c2276d1cac8c37320c9ed11c5a8a6306 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -2656,8 +2656,8 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(struct net *net,
                                           sctp_cmd_seq_t *commands)
 {
        struct sctp_chunk *chunk = arg;
-       sctp_shutdownhdr_t *sdh;
        sctp_disposition_t disposition;
+       struct sctp_shutdownhdr *sdh;
        struct sctp_ulpevent *ev;
        __u32 ctsn;
 
@@ -2671,8 +2671,8 @@ sctp_disposition_t sctp_sf_do_9_2_shutdown(struct net *net,
                                                  commands);
 
        /* Convert the elaborate header.  */
-       sdh = (sctp_shutdownhdr_t *)chunk->skb->data;
-       skb_pull(chunk->skb, sizeof(sctp_shutdownhdr_t));
+       sdh = (struct sctp_shutdownhdr *)chunk->skb->data;
+       skb_pull(chunk->skb, sizeof(*sdh));
        chunk->subh.shutdown_hdr = sdh;
        ctsn = ntohl(sdh->cum_tsn_ack);
 
@@ -2746,7 +2746,7 @@ sctp_disposition_t sctp_sf_do_9_2_shut_ctsn(struct net *net,
                                           sctp_cmd_seq_t *commands)
 {
        struct sctp_chunk *chunk = arg;
-       sctp_shutdownhdr_t *sdh;
+       struct sctp_shutdownhdr *sdh;
        __u32 ctsn;
 
        if (!sctp_vtag_verify(chunk, asoc))
@@ -2758,7 +2758,7 @@ sctp_disposition_t sctp_sf_do_9_2_shut_ctsn(struct net *net,
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
 
-       sdh = (sctp_shutdownhdr_t *)chunk->skb->data;
+       sdh = (struct sctp_shutdownhdr *)chunk->skb->data;
        ctsn = ntohl(sdh->cum_tsn_ack);
 
        if (TSN_lt(ctsn, asoc->ctsn_ack_point)) {