sctp: remove the typedef sctp_operr_chunk_t

This patch is to remove the typedef sctp_operr_chunk_t, and
replace with struct sctp_operr_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 d35bdd30fa0ff4a16c6fa15f0a8b3da8f37e6aeb..07c12e98fa854782ad468eea6e46987574efa91c 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -433,10 +433,10 @@ struct sctp_errhdr {
        __u8  variable[0];
 };
 
-typedef struct sctp_operr_chunk {
+struct sctp_operr_chunk {
        struct sctp_chunkhdr chunk_hdr;
        struct sctp_errhdr err_hdr;
-} sctp_operr_chunk_t;
+};
 
 /* RFC 2960 3.3.10 - Operation Error
  *

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 7a2ba4c187d05c86a0c21a204d3cfa968f169fec..3b121d2ca309fbdb7abfd2753adf26f454dc7cf2 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -2278,7 +2278,7 @@ sctp_disposition_t sctp_sf_cookie_echoed_err(struct net *net,
        /* Make sure that the ERROR chunk has a valid length.
         * The parameter walking depends on this as well.
         */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_operr_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_operr_chunk)))
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
 
@@ -3317,7 +3317,7 @@ sctp_disposition_t sctp_sf_operr_notify(struct net *net,
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
 
        /* Make sure that the ERROR chunk has a valid length. */
-       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_operr_chunk_t)))
+       if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_operr_chunk)))
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
                                                  commands);
        sctp_walk_errors(err, chunk->chunk_hdr);