sctp: remove the typedef sctp_ipv6addr_param_t

This patch is to remove the typedef sctp_ipv6addr_param_t, and replace
with struct sctp_ipv6addr_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 e42095d7ce577c69c61f76e4f29747e80ebe35cf..6b45c8a386425bbafee77c691ef5f289e2f241a1 100644 (file)
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -279,10 +279,10 @@ struct sctp_ipv4addr_param {
 };
 
 /* Section 3.3.2.1. IPv6 Address Parameter (6) */
-typedef struct sctp_ipv6addr_param {
+struct sctp_ipv6addr_param {
        struct sctp_paramhdr param_hdr;
        struct in6_addr addr;
-} sctp_ipv6addr_param_t;
+};
 
 /* Section 3.3.2.1 Cookie Preservative (9) */
 typedef struct sctp_cookie_preserve_param {

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 2a186b201ad2c20594169633b241dacd0cc971c0..107d7c912922c3f9aabd2178197f78e08ab2f112 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -497,7 +497,7 @@ static void sctp_v6_from_addr_param(union sctp_addr *addr,
 static int sctp_v6_to_addr_param(const union sctp_addr *addr,
                                 union sctp_addr_param *param)
 {
-       int length = sizeof(sctp_ipv6addr_param_t);
+       int length = sizeof(struct sctp_ipv6addr_param);
 
        param->v6.param_hdr.type = SCTP_PARAM_IPV6_ADDRESS;
        param->v6.param_hdr.length = htons(length);

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 0dc64da74d55d304afe359bb5a2ec3f83c534415..e5be305072b5bf36d58c38fe2f7913b6d4db1435 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -3163,7 +3163,7 @@ bool sctp_verify_asconf(const struct sctp_association *asoc,
                        addr_param_seen = true;
                        break;
                case SCTP_PARAM_IPV6_ADDRESS:
-                       if (length != sizeof(sctp_ipv6addr_param_t))
+                       if (length != sizeof(struct sctp_ipv6addr_param))
                                return false;
                        if (param.v != addip->addip_hdr.params)
                                return false;