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

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

sctp: remove the typedef sctp_scope_t 



This patch is to remove the typedef sctp_scope_t, and
replace with enum sctp_scope 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 701ef3e6

include/net/sctp/constants.h

+2 −2
Original line number Diff line number Diff line
@@ -333,13 +333,13 @@ 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;

};



enum {

	SCTP_SCOPE_POLICY_DISABLE,	/* Disable IPv4 address scoping */

include/net/sctp/sctp.h

+2 −2
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);

include/net/sctp/structs.h

+9 −8
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 *,
@@ -1111,7 +1111,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,
@@ -1135,8 +1135,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);
@@ -1925,8 +1926,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 *);
@@ -1967,8 +1968,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);

net/sctp/associola.c

+8 −9
Original line number Diff line number Diff line
@@ -63,11 +63,11 @@ static void sctp_assoc_free_asconf_queue(struct sctp_association *asoc); 
/* 1st Level Abstractions. */



/* Initialize a new association from provided memory. */

static struct sctp_association *sctp_association_init(struct sctp_association *asoc,

static struct sctp_association *sctp_association_init(

					struct sctp_association *asoc,

					const struct sctp_endpoint *ep,

					const struct sock *sk,

					  sctp_scope_t scope,

					  gfp_t gfp)

					enum sctp_scope scope, gfp_t gfp)

{

	struct net *net = sock_net(sk);

	struct sctp_sock *sp;
@@ -302,8 +302,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a 
/* Allocate and initialize a new association */

struct sctp_association *sctp_association_new(const struct sctp_endpoint *ep,

					      const struct sock *sk,

					 sctp_scope_t scope,

					 gfp_t gfp)

					      enum sctp_scope scope, gfp_t gfp)

{

	struct sctp_association *asoc;
@@ -1564,7 +1563,7 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned int len) 
 * local endpoint and the remote peer.

 */

int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc,

				     sctp_scope_t scope, gfp_t gfp)

				     enum sctp_scope scope, gfp_t gfp)

{

	int flags;

net/sctp/bind_addr.c

+10 −10
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ 
#include <net/sctp/sm.h>



/* Forward declarations for internal helpers. */

static int sctp_copy_one_addr(struct net *, struct sctp_bind_addr *,

			      union sctp_addr *, sctp_scope_t scope, gfp_t gfp,

			      int flags);

static int sctp_copy_one_addr(struct net *net, struct sctp_bind_addr *dest,

			      union sctp_addr *addr, enum sctp_scope scope,

			      gfp_t gfp, int flags);

static void sctp_bind_addr_clean(struct sctp_bind_addr *);



/* First Level Abstractions. */
@@ -57,7 +57,7 @@ static void sctp_bind_addr_clean(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)

{

	struct sctp_sockaddr_entry *addr;
@@ -440,9 +440,8 @@ union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr *bp, 


/* Copy out addresses from the global local address list. */

static int sctp_copy_one_addr(struct net *net, struct sctp_bind_addr *dest,

			      union sctp_addr *addr,

			      sctp_scope_t scope, gfp_t gfp,

			      int flags)

			      union sctp_addr *addr, enum sctp_scope scope,

			      gfp_t gfp, int flags)

{

	int error = 0;
@@ -485,9 +484,10 @@ int sctp_is_any(struct sock *sk, const union sctp_addr *addr) 
}



/* Is 'addr' valid for 'scope'?  */

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

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

		  enum sctp_scope scope)

{

	sctp_scope_t addr_scope = sctp_scope(addr);

	enum sctp_scope addr_scope = sctp_scope(addr);



	/* The unusable SCTP addresses will not be considered with

	 * any defined scopes.
@@ -545,7 +545,7 @@ int sctp_is_ep_boundall(struct sock *sk) 
 ********************************************************************/



/* What is the scope of 'addr'?  */

sctp_scope_t sctp_scope(const union sctp_addr *addr)

enum sctp_scope sctp_scope(const union sctp_addr *addr)

{

	struct sctp_af *af;