Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84965614 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: remove the typedef sctp_sock_state_t 



This patch is to remove the typedef sctp_sock_state_t, and
replace with enum sctp_sock_state in the places where it's
using this typedef.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ceaeebe

include/net/sctp/constants.h

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 


#include <linux/sctp.h>

#include <linux/ipv6.h> /* For ipv6hdr. */

#include <net/tcp_states.h>  /* For TCP states used in sctp_sock_state_t */

#include <net/tcp_states.h>  /* For TCP states used in enum sctp_sock_state */



/* Value used for stream negotiation. */

enum { SCTP_MAX_STREAM = 0xffff };
@@ -214,13 +214,13 @@ typedef enum { 
 * - A socket in SCTP_SS_ESTABLISHED state indicates that it has a single 

 *   association.

 */

typedef enum {

enum sctp_sock_state {

	SCTP_SS_CLOSED         = TCP_CLOSE,

	SCTP_SS_LISTENING      = TCP_LISTEN,

	SCTP_SS_ESTABLISHING   = TCP_SYN_SENT,

	SCTP_SS_ESTABLISHED    = TCP_ESTABLISHED,

	SCTP_SS_CLOSING        = TCP_CLOSE_WAIT,

} sctp_sock_state_t;

};



/* These functions map various type to printable names.  */

const char *sctp_cname(const sctp_subtype_t);	/* chunk types */

include/net/sctp/sctp.h

+2 −1
Original line number Diff line number Diff line
@@ -565,7 +565,8 @@ static inline int __sctp_state(const struct sctp_association *asoc, 


/* Is the socket in this state? */

#define sctp_sstate(sk, state) __sctp_sstate((sk), (SCTP_SS_##state))

static inline int __sctp_sstate(const struct sock *sk, sctp_sock_state_t state)

static inline int __sctp_sstate(const struct sock *sk,

				enum sctp_sock_state state)

{

	return sk->sk_state == state;

}