Commit 1afec92b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sctp-remove-typedefs-from-structures-part-5' 



Xin Long says:

====================
sctp: remove typedefs from structures part 5

As we know, typedef is suggested not to use in kernel, even checkpatch.pl
also gives warnings about it. Now sctp is using it for many structures.

All this kind of typedef's using should be removed. This patchset is the
part 5 to remove all typedefs in include/net/sctp/constants.h.

Just as the part 1-4, No any code's logic would be changed in these patches,
only cleaning up.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1126f470 bfc6f827

include/net/sctp/command.h

+4 −4
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ typedef union { 
	__u8 u8;

	int error;

	__be16 err;

	sctp_state_t state;

	sctp_event_timeout_t to;

	enum sctp_state state;

	enum sctp_event_timeout to;

	struct sctp_chunk *chunk;

	struct sctp_association *asoc;

	struct sctp_transport *transport;
@@ -167,8 +167,8 @@ SCTP_ARG_CONSTRUCTOR(U16, __u16, u16) 
SCTP_ARG_CONSTRUCTOR(U8,	__u8, u8)

SCTP_ARG_CONSTRUCTOR(ERROR,     int, error)

SCTP_ARG_CONSTRUCTOR(PERR,      __be16, err)	/* protocol error */

SCTP_ARG_CONSTRUCTOR(STATE,	sctp_state_t, state)

SCTP_ARG_CONSTRUCTOR(TO,	sctp_event_timeout_t, to)

SCTP_ARG_CONSTRUCTOR(STATE,	enum sctp_state, state)

SCTP_ARG_CONSTRUCTOR(TO,	enum sctp_event_timeout, to)

SCTP_ARG_CONSTRUCTOR(CHUNK,	struct sctp_chunk *, chunk)

SCTP_ARG_CONSTRUCTOR(ASOC,	struct sctp_association *, asoc)

SCTP_ARG_CONSTRUCTOR(TRANSPORT,	struct sctp_transport *, transport)

include/net/sctp/constants.h

+44 −45
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 };
@@ -71,20 +71,18 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM }; 
					 SCTP_NUM_AUTH_CHUNK_TYPES)



/* These are the different flavours of event.  */

typedef enum {



enum sctp_event {

	SCTP_EVENT_T_CHUNK = 1,

	SCTP_EVENT_T_TIMEOUT,

	SCTP_EVENT_T_OTHER,

	SCTP_EVENT_T_PRIMITIVE



} sctp_event_t;

};



/* As a convenience for the state machine, we append SCTP_EVENT_* and

 * SCTP_ULP_* to the list of possible chunks.

 */



typedef enum {

enum sctp_event_timeout {

	SCTP_EVENT_TIMEOUT_NONE = 0,

	SCTP_EVENT_TIMEOUT_T1_COOKIE,

	SCTP_EVENT_TIMEOUT_T1_INIT,
@@ -96,21 +94,21 @@ typedef enum { 
	SCTP_EVENT_TIMEOUT_RECONF,

	SCTP_EVENT_TIMEOUT_SACK,

	SCTP_EVENT_TIMEOUT_AUTOCLOSE,

} sctp_event_timeout_t;

};



#define SCTP_EVENT_TIMEOUT_MAX		SCTP_EVENT_TIMEOUT_AUTOCLOSE

#define SCTP_NUM_TIMEOUT_TYPES		(SCTP_EVENT_TIMEOUT_MAX + 1)



typedef enum {

enum sctp_event_other {

	SCTP_EVENT_NO_PENDING_TSN = 0,

	SCTP_EVENT_ICMP_PROTO_UNREACH,

} sctp_event_other_t;

};



#define SCTP_EVENT_OTHER_MAX		SCTP_EVENT_ICMP_PROTO_UNREACH

#define SCTP_NUM_OTHER_TYPES		(SCTP_EVENT_OTHER_MAX + 1)



/* These are primitive requests from the ULP.  */

typedef enum {

enum sctp_event_primitive {

	SCTP_PRIMITIVE_ASSOCIATE = 0,

	SCTP_PRIMITIVE_SHUTDOWN,

	SCTP_PRIMITIVE_ABORT,
@@ -118,7 +116,7 @@ typedef enum { 
	SCTP_PRIMITIVE_REQUESTHEARTBEAT,

	SCTP_PRIMITIVE_ASCONF,

	SCTP_PRIMITIVE_RECONF,

} sctp_event_primitive_t;

};



#define SCTP_EVENT_PRIMITIVE_MAX	SCTP_PRIMITIVE_RECONF

#define SCTP_NUM_PRIMITIVE_TYPES	(SCTP_EVENT_PRIMITIVE_MAX + 1)
@@ -126,25 +124,25 @@ typedef enum { 
/* We define here a utility type for manipulating subtypes.

 * The subtype constructors all work like this:

 *

 * 	sctp_subtype_t foo = SCTP_ST_CHUNK(SCTP_CID_INIT);

 *   union sctp_subtype foo = SCTP_ST_CHUNK(SCTP_CID_INIT);

 */



typedef union {

union sctp_subtype {

	enum sctp_cid chunk;

	sctp_event_timeout_t timeout;

	sctp_event_other_t other;

	sctp_event_primitive_t primitive;

} sctp_subtype_t;

	enum sctp_event_timeout timeout;

	enum sctp_event_other other;

	enum sctp_event_primitive primitive;

};



#define SCTP_SUBTYPE_CONSTRUCTOR(_name, _type, _elt) \

static inline sctp_subtype_t	\

static inline union sctp_subtype	\

SCTP_ST_## _name (_type _arg)		\

{ sctp_subtype_t _retval; _retval._elt = _arg; return _retval; }

{ union sctp_subtype _retval; _retval._elt = _arg; return _retval; }



SCTP_SUBTYPE_CONSTRUCTOR(CHUNK,		enum sctp_cid,		chunk)

SCTP_SUBTYPE_CONSTRUCTOR(TIMEOUT,	sctp_event_timeout_t,	timeout)

SCTP_SUBTYPE_CONSTRUCTOR(OTHER,		sctp_event_other_t,	other)

SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE,	sctp_event_primitive_t,	primitive)

SCTP_SUBTYPE_CONSTRUCTOR(TIMEOUT,	enum sctp_event_timeout, timeout)

SCTP_SUBTYPE_CONSTRUCTOR(OTHER,		enum sctp_event_other,	other)

SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE,	enum sctp_event_primitive, primitive)





#define sctp_chunk_is_data(a) (a->chunk_hdr->type == SCTP_CID_DATA)
@@ -155,8 +153,7 @@ SCTP_SUBTYPE_CONSTRUCTOR(PRIMITIVE, sctp_event_primitive_t, primitive) 
				- sizeof(struct sctp_data_chunk)))



/* Internal error codes */

typedef enum {



enum sctp_ierror {

	SCTP_IERROR_NO_ERROR	        = 0,

	SCTP_IERROR_BASE		= 1000,

	SCTP_IERROR_NO_COOKIE,
@@ -177,12 +174,12 @@ typedef enum { 
	SCTP_IERROR_PROTO_VIOLATION,

	SCTP_IERROR_ERROR,

	SCTP_IERROR_ABORT,

} sctp_ierror_t;

};







/* SCTP state defines for internal state machine */

typedef enum {

enum sctp_state {



	SCTP_STATE_CLOSED		= 0,

	SCTP_STATE_COOKIE_WAIT		= 1,
@@ -193,7 +190,7 @@ typedef enum { 
	SCTP_STATE_SHUTDOWN_RECEIVED	= 6,

	SCTP_STATE_SHUTDOWN_ACK_SENT	= 7,



} sctp_state_t;

};



#define SCTP_STATE_MAX			SCTP_STATE_SHUTDOWN_ACK_SENT

#define SCTP_STATE_NUM_STATES		(SCTP_STATE_MAX + 1)
@@ -214,19 +211,19 @@ 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 */

const char *sctp_oname(const sctp_subtype_t);	/* other events */

const char *sctp_tname(const sctp_subtype_t);	/* timeouts */

const char *sctp_pname(const sctp_subtype_t);	/* primitives */

const char *sctp_cname(const union sctp_subtype id);	/* chunk types */

const char *sctp_oname(const union sctp_subtype id);	/* other events */

const char *sctp_tname(const union sctp_subtype id);	/* timeouts */

const char *sctp_pname(const union sctp_subtype id);	/* primitives */



/* This is a table of printable names of sctp_state_t's.  */

extern const char *const sctp_state_tbl[];
@@ -312,19 +309,19 @@ enum { SCTP_MAX_GABS = 16 }; 
/* These return values describe the success or failure of a number of

 * routines which form the lower interface to SCTP_outqueue.

 */

typedef enum {

enum sctp_xmit {

	SCTP_XMIT_OK,

	SCTP_XMIT_PMTU_FULL,

	SCTP_XMIT_RWND_FULL,

	SCTP_XMIT_DELAY,

} sctp_xmit_t;

};



/* These are the commands for manipulating transports.  */

typedef enum {

enum sctp_transport_cmd {

	SCTP_TRANSPORT_UP,

	SCTP_TRANSPORT_DOWN,

	SCTP_TRANSPORT_PF,

} sctp_transport_cmd_t;

};



/* These are the address scopes defined mainly for IPv4 addresses

 * based on draft of SCTP IPv4 scoping <draft-stewart-tsvwg-sctp-ipv4-00.txt>.
@@ -333,20 +330,22 @@ typedef enum { 
 * At this point, the IPv6 scopes will be mapped to these internal scopes

 * as much as possible.

 */

typedef enum {

enum sctp_scope {

	SCTP_SCOPE_GLOBAL,		/* IPv4 global addresses */

	SCTP_SCOPE_PRIVATE,		/* IPv4 private addresses */

	SCTP_SCOPE_LINK,		/* IPv4 link local address */

	SCTP_SCOPE_LOOPBACK,		/* IPv4 loopback address */

	SCTP_SCOPE_UNUSABLE,		/* IPv4 unusable addresses */

} sctp_scope_t;

};



typedef enum {

enum {

	SCTP_SCOPE_POLICY_DISABLE,	/* Disable IPv4 address scoping */

	SCTP_SCOPE_POLICY_ENABLE,	/* Enable IPv4 address scoping */

	SCTP_SCOPE_POLICY_PRIVATE,	/* Follow draft but allow IPv4 private addresses */

	SCTP_SCOPE_POLICY_LINK,		/* Follow draft but allow IPv4 link local addresses */

} sctp_scope_policy_t;

};



#define SCTP_SCOPE_POLICY_MAX	SCTP_SCOPE_POLICY_LINK



/* Based on IPv4 scoping <draft-stewart-tsvwg-sctp-ipv4-00.txt>,

 * SCTP IPv4 unusable addresses: 0.0.0.0/8, 224.0.0.0/4, 198.18.0.0/24,
@@ -370,20 +369,20 @@ typedef enum { 
						   peer */



/* Reasons to retransmit. */

typedef enum {

enum sctp_retransmit_reason {

	SCTP_RTXR_T3_RTX,

	SCTP_RTXR_FAST_RTX,

	SCTP_RTXR_PMTUD,

	SCTP_RTXR_T1_RTX,

} sctp_retransmit_reason_t;

};



/* Reasons to lower cwnd. */

typedef enum {

enum sctp_lower_cwnd {

	SCTP_LOWER_CWND_T3_RTX,

	SCTP_LOWER_CWND_FAST_RTX,

	SCTP_LOWER_CWND_ECNE,

	SCTP_LOWER_CWND_INACTIVE,

} sctp_lower_cwnd_t;

};





/* SCTP-AUTH Necessary constants */

include/net/sctp/sctp.h

+5 −4
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ 
/*

 * sctp/protocol.c

 */

int sctp_copy_local_addr_list(struct net *, struct sctp_bind_addr *,

			      sctp_scope_t, gfp_t gfp, int flags);

int sctp_copy_local_addr_list(struct net *net, struct sctp_bind_addr *addr,

			      enum sctp_scope, gfp_t gfp, int flags);

struct sctp_pf *sctp_get_pf_specific(sa_family_t family);

int sctp_register_pf(struct sctp_pf *, sa_family_t);

void sctp_addr_wq_mgmt(struct net *, struct sctp_sockaddr_entry *, int);
@@ -558,14 +558,15 @@ static inline int __sctp_style(const struct sock *sk, sctp_socket_type_t style) 
/* Is the association in this state? */

#define sctp_state(asoc, state) __sctp_state((asoc), (SCTP_STATE_##state))

static inline int __sctp_state(const struct sctp_association *asoc,

			       sctp_state_t state)

			       enum sctp_state state)

{

	return asoc->state == state;

}



/* 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;

}

include/net/sctp/sm.h

+10 −11
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ typedef struct { 
typedef sctp_disposition_t (sctp_state_fn_t) (struct net *,

					      const struct sctp_endpoint *,

					      const struct sctp_association *,

					      const sctp_subtype_t type,

					      const union sctp_subtype type,

					      void *arg,

					      sctp_cmd_seq_t *);

typedef void (sctp_timer_event_t) (unsigned long);
@@ -175,10 +175,11 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire; 


/* Prototypes for utility support functions.  */

__u8 sctp_get_chunk_type(struct sctp_chunk *chunk);

const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *,

					    sctp_event_t,

					    sctp_state_t,

					    sctp_subtype_t);

const sctp_sm_table_entry_t *sctp_sm_lookup_event(

					struct net *net,

					enum sctp_event event_type,

					enum sctp_state state,

					union sctp_subtype event_subtype);

int sctp_chunk_iif(const struct sctp_chunk *);

struct sctp_association *sctp_make_temp_asoc(const struct sctp_endpoint *,

					     struct sctp_chunk *,
@@ -312,12 +313,10 @@ struct sctp_chunk *sctp_process_strreset_resp( 


/* Prototypes for statetable processing. */



int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,

	       sctp_state_t state,

               struct sctp_endpoint *,

               struct sctp_association *asoc,

               void *event_arg,

	       gfp_t gfp);

int sctp_do_sm(struct net *net, enum sctp_event event_type,

	       union sctp_subtype subtype, enum sctp_state state,

	       struct sctp_endpoint *ep, struct sctp_association *asoc,

	       void *event_arg, gfp_t gfp);



/* 2nd level prototypes */

void sctp_generate_t3_rtx_event(unsigned long peer);

include/net/sctp/structs.h

+23 −19
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ struct sctp_af { 
	int		(*addr_valid)	(union sctp_addr *,

					 struct sctp_sock *,

					 const struct sk_buff *);

	sctp_scope_t	(*scope) (union sctp_addr *);

	enum sctp_scope	(*scope)(union sctp_addr *);

	void		(*inaddr_any)	(union sctp_addr *, __be16);

	int		(*is_any)	(const union sctp_addr *);

	int		(*available)	(union sctp_addr *,
@@ -697,10 +697,11 @@ struct sctp_packet { 
void sctp_packet_init(struct sctp_packet *, struct sctp_transport *,

		      __u16 sport, __u16 dport);

void sctp_packet_config(struct sctp_packet *, __u32 vtag, int);

sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *,

				       struct sctp_chunk *, int, gfp_t);

sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *,

                                     struct sctp_chunk *);

enum sctp_xmit sctp_packet_transmit_chunk(struct sctp_packet *packet,

					  struct sctp_chunk *chunk,

					  int one_packet, gfp_t gfp);

enum sctp_xmit sctp_packet_append_chunk(struct sctp_packet *packet,

					struct sctp_chunk *chunk);

int sctp_packet_transmit(struct sctp_packet *, gfp_t);

void sctp_packet_free(struct sctp_packet *);
@@ -950,7 +951,8 @@ int sctp_transport_hold(struct sctp_transport *); 
void sctp_transport_put(struct sctp_transport *);

void sctp_transport_update_rto(struct sctp_transport *, __u32);

void sctp_transport_raise_cwnd(struct sctp_transport *, __u32, __u32);

void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t);

void sctp_transport_lower_cwnd(struct sctp_transport *t,

			       enum sctp_lower_cwnd reason);

void sctp_transport_burst_limited(struct sctp_transport *);

void sctp_transport_burst_reset(struct sctp_transport *);

unsigned long sctp_transport_timeout(struct sctp_transport *);
@@ -1053,8 +1055,8 @@ int sctp_outq_sack(struct sctp_outq *, struct sctp_chunk *); 
int sctp_outq_is_empty(const struct sctp_outq *);

void sctp_outq_restart(struct sctp_outq *);



void sctp_retransmit(struct sctp_outq *, struct sctp_transport *,

		     sctp_retransmit_reason_t);

void sctp_retransmit(struct sctp_outq *q, struct sctp_transport *transport,

		     enum sctp_retransmit_reason reason);

void sctp_retransmit_mark(struct sctp_outq *, struct sctp_transport *, __u8);

void sctp_outq_uncork(struct sctp_outq *, gfp_t gfp);

void sctp_prsctp_prune(struct sctp_association *asoc,
@@ -1110,7 +1112,7 @@ void sctp_bind_addr_init(struct sctp_bind_addr *, __u16 port); 
void sctp_bind_addr_free(struct sctp_bind_addr *);

int sctp_bind_addr_copy(struct net *net, struct sctp_bind_addr *dest,

			const struct sctp_bind_addr *src,

			sctp_scope_t scope, gfp_t gfp,

			enum sctp_scope scope, gfp_t gfp,

			int flags);

int sctp_bind_addr_dup(struct sctp_bind_addr *dest,

			const struct sctp_bind_addr *src,
@@ -1134,8 +1136,9 @@ union sctp_params sctp_bind_addrs_to_raw(const struct sctp_bind_addr *bp, 
int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw, int len,

			   __u16 port, gfp_t gfp);



sctp_scope_t sctp_scope(const union sctp_addr *);

int sctp_in_scope(struct net *net, const union sctp_addr *addr, const sctp_scope_t scope);

enum sctp_scope sctp_scope(const union sctp_addr *addr);

int sctp_in_scope(struct net *net, const union sctp_addr *addr,

		  const enum sctp_scope scope);

int sctp_is_any(struct sock *sk, const union sctp_addr *addr);

int sctp_is_ep_boundall(struct sock *sk);
@@ -1574,7 +1577,7 @@ struct sctp_association { 
	 *

	 *		State takes values from SCTP_STATE_*.

	 */

	sctp_state_t state;

	enum sctp_state state;



	/* Overall     : The overall association error count.

	 * Error Count : [Clear this any time I get something.]
@@ -1924,8 +1927,8 @@ static inline struct sctp_association *sctp_assoc(struct sctp_ep_common *base) 




struct sctp_association *

sctp_association_new(const struct sctp_endpoint *, const struct sock *,

		     sctp_scope_t scope, gfp_t gfp);

sctp_association_new(const struct sctp_endpoint *ep, const struct sock *sk,

		     enum sctp_scope scope, gfp_t gfp);

void sctp_association_free(struct sctp_association *);

void sctp_association_put(struct sctp_association *);

void sctp_association_hold(struct sctp_association *);
@@ -1945,9 +1948,10 @@ void sctp_assoc_del_peer(struct sctp_association *asoc, 
			 const union sctp_addr *addr);

void sctp_assoc_rm_peer(struct sctp_association *asoc,

			 struct sctp_transport *peer);

void sctp_assoc_control_transport(struct sctp_association *,

				  struct sctp_transport *,

				  sctp_transport_cmd_t, sctp_sn_error_t);

void sctp_assoc_control_transport(struct sctp_association *asoc,

				  struct sctp_transport *transport,

				  enum sctp_transport_cmd command,

				  sctp_sn_error_t error);

struct sctp_transport *sctp_assoc_lookup_tsn(struct sctp_association *, __u32);

struct sctp_transport *sctp_assoc_is_match(struct sctp_association *,

					   struct net *,
@@ -1966,8 +1970,8 @@ void sctp_assoc_set_primary(struct sctp_association *, 
			    struct sctp_transport *);

void sctp_assoc_del_nonprimary_peers(struct sctp_association *,

				    struct sctp_transport *);

int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *,

				     sctp_scope_t, gfp_t);

int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc,

				     enum sctp_scope scope, gfp_t gfp);

int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *,

					 struct sctp_cookie*,

					 gfp_t gfp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE