sctp: remove the typedef sctp_ipv4addr_param_t

This patch is to remove the typedef sctp_ipv4addr_param_t, and replace
with struct sctp_ipv4addr_param 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 99e866487e2f5cea6311b1617afe115c94da00f5..e42095d7ce577c69c61f76e4f29747e80ebe35cf 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -273,10 +273,10 @@ struct sctp_init_chunk {
 
 
 /* Section 3.3.2.1. IPv4 Address Parameter (5) */
-typedef struct sctp_ipv4addr_param {
+struct sctp_ipv4addr_param {
        struct sctp_paramhdr param_hdr;
-       struct in_addr  addr;
-} sctp_ipv4addr_param_t;
+       struct in_addr addr;
+};
 
 /* Section 3.3.2.1. IPv6 Address Parameter (6) */
 typedef struct sctp_ipv6addr_param {

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 989a900383b57c57590bff37e3aee7426fb0b156..852556d67ae325b7c21f225f3813ea94cf337496 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -292,7 +292,7 @@ static void sctp_v4_from_addr_param(union sctp_addr *addr,
 static int sctp_v4_to_addr_param(const union sctp_addr *addr,
                                 union sctp_addr_param *param)
 {
-       int length = sizeof(sctp_ipv4addr_param_t);
+       int length = sizeof(struct sctp_ipv4addr_param);
 
        param->v4.param_hdr.type = SCTP_PARAM_IPV4_ADDRESS;
        param->v4.param_hdr.length = htons(length);

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 4e16b02ed8321fcbd022cee0ed2c9d9c90d422a6..0dc64da74d55d304afe359bb5a2ec3f83c534415 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -3153,7 +3153,7 @@ bool sctp_verify_asconf(const struct sctp_association *asoc,
                case SCTP_PARAM_ERR_CAUSE:
                        break;
                case SCTP_PARAM_IPV4_ADDRESS:
-                       if (length != sizeof(sctp_ipv4addr_param_t))
+                       if (length != sizeof(struct sctp_ipv4addr_param))
                                return false;
                        /* ensure there is only one addr param and it's in the
                         * beginning of addip_hdr params, or we reject it.