sctp: remove the typedef sctp_socket_type_t

This patch is to remove the typedef sctp_socket_type_t, and
replace with enum sctp_socket_type 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/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 24ff7931d38cc974162b2e203dfb9a5d104b7ab1..06b4f515e15727455c784c54bc572407ebbb5fa4 100644 (file)
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -550,7 +550,8 @@ static inline int sctp_ep_hashfn(struct net *net, __u16 lport)
 
 /* Is a socket of this style? */
 #define sctp_style(sk, style) __sctp_style((sk), (SCTP_SOCKET_##style))
-static inline int __sctp_style(const struct sock *sk, sctp_socket_type_t style)
+static inline int __sctp_style(const struct sock *sk,
+                              enum sctp_socket_type style)
 {
        return sctp_sk(sk)->type == style;
 }

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index b6d75b37f84dd52e87b82effd87da4273475b7ec..0477945de1a3cf5c27348e99d9a30e02c491d1de 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -150,18 +150,18 @@ extern struct sctp_globals {
 #define sctp_checksum_disable          (sctp_globals.checksum_disable)
 
 /* SCTP Socket type: UDP or TCP style. */
-typedef enum {
+enum sctp_socket_type {
        SCTP_SOCKET_UDP = 0,
        SCTP_SOCKET_UDP_HIGH_BANDWIDTH,
        SCTP_SOCKET_TCP
-} sctp_socket_type_t;
+};
 
 /* Per socket SCTP information. */
 struct sctp_sock {
        /* inet_sock has to be the first member of sctp_sock */
        struct inet_sock inet;
        /* What kind of a socket is this? */
-       sctp_socket_type_t type;
+       enum sctp_socket_type type;
 
        /* PF_ family specific functions.  */
        struct sctp_pf *pf;

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 018190655d63f8bc50f118635df724569c8ed90f..c01af72cc603c794204db4b63dff001ae15360ba 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -100,8 +100,9 @@ static int sctp_send_asconf(struct sctp_association *asoc,
                            struct sctp_chunk *chunk);
 static int sctp_do_bind(struct sock *, union sctp_addr *, int);
 static int sctp_autobind(struct sock *sk);
-static void sctp_sock_migrate(struct sock *, struct sock *,
-                             struct sctp_association *, sctp_socket_type_t);
+static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
+                             struct sctp_association *assoc,
+                             enum sctp_socket_type type);
 
 static unsigned long sctp_memory_pressure;
 static atomic_long_t sctp_memory_allocated;
@@ -8086,7 +8087,7 @@ static inline void sctp_copy_descendant(struct sock *sk_to,
  */
 static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
                              struct sctp_association *assoc,
-                             sctp_socket_type_t type)
+                             enum sctp_socket_type type)
 {
        struct sctp_sock *oldsp = sctp_sk(oldsk);
        struct sctp_sock *newsp = sctp_sk(newsk);