sctp: remove the typedef sctp_abort_chunk_t

This patch is to remove the typedef sctp_abort_chunk_t, and
replace with struct sctp_abort_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 bfda7c66960c027b0dc168741d33e2bf9a48daa1..ba007163acfd1427f30fd0edf285a0e52f4e1e1d 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -408,9 +408,9 @@ struct sctp_heartbeat_chunk {
  * common header. Just the common header is all that is needed with a
  * chunk descriptor.
  */
-typedef struct sctp_abort_chunk {
+struct sctp_abort_chunk {
        struct sctp_chunkhdr uh;
-} sctp_abort_chunk_t;
+};
 
 
 /* For the graceful shutdown we must carry the tag (in common header)

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 7bbee085b476cb1b4b338fd16fca12f6041af0e5..dc0c2c4188d8a575d2c5c403b0353aa5fc764a35 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -2164,7 +2164,7 @@ sctp_disposition_t sctp_sf_shutdown_pending_abort(
         * as we do not know its true length.  So, to be safe, discard the
         * packet.
         */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_abort_chunk)))
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
 
        /* ADD-IP: Special case for ABORT chunks
@@ -2206,7 +2206,7 @@ sctp_disposition_t sctp_sf_shutdown_sent_abort(struct net *net,
         * as we do not know its true length.  So, to be safe, discard the
         * packet.
         */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_abort_chunk)))
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
 
        /* ADD-IP: Special case for ABORT chunks
@@ -2470,7 +2470,7 @@ sctp_disposition_t sctp_sf_do_9_1_abort(struct net *net,
         * as we do not know its true length.  So, to be safe, discard the
         * packet.
         */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_abort_chunk)))
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
 
        /* ADD-IP: Special case for ABORT chunks
@@ -2546,7 +2546,7 @@ sctp_disposition_t sctp_sf_cookie_wait_abort(struct net *net,
         * as we do not know its true length.  So, to be safe, discard the
         * packet.
         */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_abort_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_abort_chunk)))
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
 
        /* See if we have an error cause code in the chunk.  */