Commit dda91928 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller

net: sctp: remove SCTP_STATIC macro

SCTP_STATIC is just another define for the static keyword. It's use
is inconsistent in the SCTP code anyway and it was introduced in the
initial implementation of SCTP in 2.5. We have a regression suite in
lksctp-tools, but this is for user space only, so noone makes use of
this macro anymore. The kernel test suite for 2.5 is incompatible with
the current SCTP code anyway.

So simply Remove it, to be more consistent with the rest of the kernel
code.
Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 939cfa75
...@@ -99,14 +99,6 @@ ...@@ -99,14 +99,6 @@
#define SCTP_PROTOSW_FLAG INET_PROTOSW_PERMANENT #define SCTP_PROTOSW_FLAG INET_PROTOSW_PERMANENT
#endif #endif
/* Certain internal static functions need to be exported when
* compiled into the test frame.
*/
#ifndef SCTP_STATIC
#define SCTP_STATIC static
#endif
/* /*
* Function declarations. * Function declarations.
*/ */
......
...@@ -66,7 +66,7 @@ static void sctp_datamsg_init(struct sctp_datamsg *msg) ...@@ -66,7 +66,7 @@ static void sctp_datamsg_init(struct sctp_datamsg *msg)
} }
/* Allocate and initialize datamsg. */ /* Allocate and initialize datamsg. */
SCTP_STATIC struct sctp_datamsg *sctp_datamsg_new(gfp_t gfp) static struct sctp_datamsg *sctp_datamsg_new(gfp_t gfp)
{ {
struct sctp_datamsg *msg; struct sctp_datamsg *msg;
msg = kmalloc(sizeof(struct sctp_datamsg), gfp); msg = kmalloc(sizeof(struct sctp_datamsg), gfp);
......
...@@ -903,7 +903,7 @@ static struct sctp_association *__sctp_lookup_association( ...@@ -903,7 +903,7 @@ static struct sctp_association *__sctp_lookup_association(
} }
/* Look up an association. BH-safe. */ /* Look up an association. BH-safe. */
SCTP_STATIC static
struct sctp_association *sctp_lookup_association(struct net *net, struct sctp_association *sctp_lookup_association(struct net *net,
const union sctp_addr *laddr, const union sctp_addr *laddr,
const union sctp_addr *paddr, const union sctp_addr *paddr,
......
...@@ -145,7 +145,7 @@ static struct notifier_block sctp_inet6addr_notifier = { ...@@ -145,7 +145,7 @@ static struct notifier_block sctp_inet6addr_notifier = {
}; };
/* ICMP error handler. */ /* ICMP error handler. */
SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, static void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
u8 type, u8 code, int offset, __be32 info) u8 type, u8 code, int offset, __be32 info)
{ {
struct inet6_dev *idev; struct inet6_dev *idev;
......
...@@ -1312,7 +1312,7 @@ static struct pernet_operations sctp_net_ops = { ...@@ -1312,7 +1312,7 @@ static struct pernet_operations sctp_net_ops = {
}; };
/* Initialize the universe into something sensible. */ /* Initialize the universe into something sensible. */
SCTP_STATIC __init int sctp_init(void) static __init int sctp_init(void)
{ {
int i; int i;
int status = -EINVAL; int status = -EINVAL;
...@@ -1499,7 +1499,7 @@ SCTP_STATIC __init int sctp_init(void) ...@@ -1499,7 +1499,7 @@ SCTP_STATIC __init int sctp_init(void)
} }
/* Exit handler for the SCTP protocol. */ /* Exit handler for the SCTP protocol. */
SCTP_STATIC __exit void sctp_exit(void) static __exit void sctp_exit(void)
{ {
/* BUG. This should probably do something useful like clean /* BUG. This should probably do something useful like clean
* up all the remaining associations and all that memory. * up all the remaining associations and all that memory.
......
...@@ -68,8 +68,7 @@ ...@@ -68,8 +68,7 @@
#include <net/sctp/sctp.h> #include <net/sctp/sctp.h>
#include <net/sctp/sm.h> #include <net/sctp/sm.h>
SCTP_STATIC static struct sctp_chunk *sctp_make_chunk(const struct sctp_association *asoc,
struct sctp_chunk *sctp_make_chunk(const struct sctp_association *asoc,
__u8 type, __u8 flags, int paylen); __u8 type, __u8 flags, int paylen);
static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep, static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
const struct sctp_association *asoc, const struct sctp_association *asoc,
...@@ -1353,8 +1352,7 @@ const union sctp_addr *sctp_source(const struct sctp_chunk *chunk) ...@@ -1353,8 +1352,7 @@ const union sctp_addr *sctp_source(const struct sctp_chunk *chunk)
/* Create a new chunk, setting the type and flags headers from the /* Create a new chunk, setting the type and flags headers from the
* arguments, reserving enough space for a 'paylen' byte payload. * arguments, reserving enough space for a 'paylen' byte payload.
*/ */
SCTP_STATIC static struct sctp_chunk *sctp_make_chunk(const struct sctp_association *asoc,
struct sctp_chunk *sctp_make_chunk(const struct sctp_association *asoc,
__u8 type, __u8 flags, int paylen) __u8 type, __u8 flags, int paylen)
{ {
struct sctp_chunk *retval; struct sctp_chunk *retval;
......
...@@ -84,11 +84,6 @@ ...@@ -84,11 +84,6 @@
#include <net/sctp/sctp.h> #include <net/sctp/sctp.h>
#include <net/sctp/sm.h> #include <net/sctp/sm.h>
/* WARNING: Please do not remove the SCTP_STATIC attribute to
* any of the functions below as they are used to export functions
* used by a project regression testsuite.
*/
/* Forward declarations for internal helper functions. */ /* Forward declarations for internal helper functions. */
static int sctp_writeable(struct sock *sk); static int sctp_writeable(struct sock *sk);
static void sctp_wfree(struct sk_buff *skb); static void sctp_wfree(struct sk_buff *skb);
...@@ -279,7 +274,7 @@ static struct sctp_transport *sctp_addr_id2transport(struct sock *sk, ...@@ -279,7 +274,7 @@ static struct sctp_transport *sctp_addr_id2transport(struct sock *sk,
* sockaddr_in6 [RFC 2553]), * sockaddr_in6 [RFC 2553]),
* addr_len - the size of the address structure. * addr_len - the size of the address structure.
*/ */
SCTP_STATIC int sctp_bind(struct sock *sk, struct sockaddr *addr, int addr_len) static int sctp_bind(struct sock *sk, struct sockaddr *addr, int addr_len)
{ {
int retval = 0; int retval = 0;
...@@ -333,7 +328,7 @@ static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt, ...@@ -333,7 +328,7 @@ static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt,
} }
/* Bind a local address either to an endpoint or to an association. */ /* Bind a local address either to an endpoint or to an association. */
SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) static int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
{ {
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
struct sctp_sock *sp = sctp_sk(sk); struct sctp_sock *sp = sctp_sk(sk);
...@@ -964,7 +959,7 @@ int sctp_asconf_mgmt(struct sctp_sock *sp, struct sctp_sockaddr_entry *addrw) ...@@ -964,7 +959,7 @@ int sctp_asconf_mgmt(struct sctp_sock *sp, struct sctp_sockaddr_entry *addrw)
* *
* Returns 0 if ok, <0 errno code on error. * Returns 0 if ok, <0 errno code on error.
*/ */
SCTP_STATIC int sctp_setsockopt_bindx(struct sock* sk, static int sctp_setsockopt_bindx(struct sock* sk,
struct sockaddr __user *addrs, struct sockaddr __user *addrs,
int addrs_size, int op) int addrs_size, int op)
{ {
...@@ -1312,7 +1307,7 @@ static int __sctp_connect(struct sock* sk, ...@@ -1312,7 +1307,7 @@ static int __sctp_connect(struct sock* sk,
* *
* Returns >=0 if ok, <0 errno code on error. * Returns >=0 if ok, <0 errno code on error.
*/ */
SCTP_STATIC int __sctp_setsockopt_connectx(struct sock* sk, static int __sctp_setsockopt_connectx(struct sock* sk,
struct sockaddr __user *addrs, struct sockaddr __user *addrs,
int addrs_size, int addrs_size,
sctp_assoc_t *assoc_id) sctp_assoc_t *assoc_id)
...@@ -1350,7 +1345,7 @@ SCTP_STATIC int __sctp_setsockopt_connectx(struct sock* sk, ...@@ -1350,7 +1345,7 @@ SCTP_STATIC int __sctp_setsockopt_connectx(struct sock* sk,
* This is an older interface. It's kept for backward compatibility * This is an older interface. It's kept for backward compatibility
* to the option that doesn't provide association id. * to the option that doesn't provide association id.
*/ */
SCTP_STATIC int sctp_setsockopt_connectx_old(struct sock* sk, static int sctp_setsockopt_connectx_old(struct sock* sk,
struct sockaddr __user *addrs, struct sockaddr __user *addrs,
int addrs_size) int addrs_size)
{ {
...@@ -1363,7 +1358,7 @@ SCTP_STATIC int sctp_setsockopt_connectx_old(struct sock* sk, ...@@ -1363,7 +1358,7 @@ SCTP_STATIC int sctp_setsockopt_connectx_old(struct sock* sk,
* indication to the call. Error is always negative and association id is * indication to the call. Error is always negative and association id is
* always positive. * always positive.
*/ */
SCTP_STATIC int sctp_setsockopt_connectx(struct sock* sk, static int sctp_setsockopt_connectx(struct sock* sk,
struct sockaddr __user *addrs, struct sockaddr __user *addrs,
int addrs_size) int addrs_size)
{ {
...@@ -1386,7 +1381,7 @@ SCTP_STATIC int sctp_setsockopt_connectx(struct sock* sk, ...@@ -1386,7 +1381,7 @@ SCTP_STATIC int sctp_setsockopt_connectx(struct sock* sk,
* addrs_num structure member. That way we can re-use the existing * addrs_num structure member. That way we can re-use the existing
* code. * code.
*/ */
SCTP_STATIC int sctp_getsockopt_connectx3(struct sock* sk, int len, static int sctp_getsockopt_connectx3(struct sock* sk, int len,
char __user *optval, char __user *optval,
int __user *optlen) int __user *optlen)
{ {
...@@ -1464,7 +1459,7 @@ SCTP_STATIC int sctp_getsockopt_connectx3(struct sock* sk, int len, ...@@ -1464,7 +1459,7 @@ SCTP_STATIC int sctp_getsockopt_connectx3(struct sock* sk, int len,
* shutdown phase does not finish during this period, close() will * shutdown phase does not finish during this period, close() will
* return but the graceful shutdown phase continues in the system. * return but the graceful shutdown phase continues in the system.
*/ */
SCTP_STATIC void sctp_close(struct sock *sk, long timeout) static void sctp_close(struct sock *sk, long timeout)
{ {
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
struct sctp_endpoint *ep; struct sctp_endpoint *ep;
...@@ -1573,9 +1568,9 @@ static int sctp_error(struct sock *sk, int flags, int err) ...@@ -1573,9 +1568,9 @@ static int sctp_error(struct sock *sk, int flags, int err)
*/ */
/* BUG: We do not implement the equivalent of sk_stream_wait_memory(). */ /* BUG: We do not implement the equivalent of sk_stream_wait_memory(). */
SCTP_STATIC int sctp_msghdr_parse(const struct msghdr *, sctp_cmsgs_t *); static int sctp_msghdr_parse(const struct msghdr *, sctp_cmsgs_t *);
SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, static int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
struct msghdr *msg, size_t msg_len) struct msghdr *msg, size_t msg_len)
{ {
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
...@@ -2034,7 +2029,7 @@ static int sctp_skb_pull(struct sk_buff *skb, int len) ...@@ -2034,7 +2029,7 @@ static int sctp_skb_pull(struct sk_buff *skb, int len)
*/ */
static struct sk_buff *sctp_skb_recv_datagram(struct sock *, int, int, int *); static struct sk_buff *sctp_skb_recv_datagram(struct sock *, int, int, int *);
SCTP_STATIC int sctp_recvmsg(struct kiocb *iocb, struct sock *sk, static int sctp_recvmsg(struct kiocb *iocb, struct sock *sk,
struct msghdr *msg, size_t len, int noblock, struct msghdr *msg, size_t len, int noblock,
int flags, int *addr_len) int flags, int *addr_len)
{ {
...@@ -3565,7 +3560,7 @@ static int sctp_setsockopt_paddr_thresholds(struct sock *sk, ...@@ -3565,7 +3560,7 @@ static int sctp_setsockopt_paddr_thresholds(struct sock *sk,
* optval - the buffer to store the value of the option. * optval - the buffer to store the value of the option.
* optlen - the size of the buffer. * optlen - the size of the buffer.
*/ */
SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname, static int sctp_setsockopt(struct sock *sk, int level, int optname,
char __user *optval, unsigned int optlen) char __user *optval, unsigned int optlen)
{ {
int retval = 0; int retval = 0;
...@@ -3725,7 +3720,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -3725,7 +3720,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
* *
* len: the size of the address. * len: the size of the address.
*/ */
SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *addr, static int sctp_connect(struct sock *sk, struct sockaddr *addr,
int addr_len) int addr_len)
{ {
int err = 0; int err = 0;
...@@ -3752,7 +3747,7 @@ SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *addr, ...@@ -3752,7 +3747,7 @@ SCTP_STATIC int sctp_connect(struct sock *sk, struct sockaddr *addr,
} }
/* FIXME: Write comments. */ /* FIXME: Write comments. */
SCTP_STATIC int sctp_disconnect(struct sock *sk, int flags) static int sctp_disconnect(struct sock *sk, int flags)
{ {
return -EOPNOTSUPP; /* STUB */ return -EOPNOTSUPP; /* STUB */
} }
...@@ -3764,7 +3759,7 @@ SCTP_STATIC int sctp_disconnect(struct sock *sk, int flags) ...@@ -3764,7 +3759,7 @@ SCTP_STATIC int sctp_disconnect(struct sock *sk, int flags)
* descriptor will be returned from accept() to represent the newly * descriptor will be returned from accept() to represent the newly
* formed association. * formed association.
*/ */
SCTP_STATIC struct sock *sctp_accept(struct sock *sk, int flags, int *err) static struct sock *sctp_accept(struct sock *sk, int flags, int *err)
{ {
struct sctp_sock *sp; struct sctp_sock *sp;
struct sctp_endpoint *ep; struct sctp_endpoint *ep;
...@@ -3817,7 +3812,7 @@ SCTP_STATIC struct sock *sctp_accept(struct sock *sk, int flags, int *err) ...@@ -3817,7 +3812,7 @@ SCTP_STATIC struct sock *sctp_accept(struct sock *sk, int flags, int *err)
} }
/* The SCTP ioctl handler. */ /* The SCTP ioctl handler. */
SCTP_STATIC int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg) static int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg)
{ {
int rc = -ENOTCONN; int rc = -ENOTCONN;
...@@ -3859,7 +3854,7 @@ SCTP_STATIC int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg) ...@@ -3859,7 +3854,7 @@ SCTP_STATIC int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg)
* initialized the SCTP-specific portion of the sock. * initialized the SCTP-specific portion of the sock.
* The sock structure should already be zero-filled memory. * The sock structure should already be zero-filled memory.
*/ */
SCTP_STATIC int sctp_init_sock(struct sock *sk) static int sctp_init_sock(struct sock *sk)
{ {
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
struct sctp_sock *sp; struct sctp_sock *sp;
...@@ -3993,7 +3988,7 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk) ...@@ -3993,7 +3988,7 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
} }
/* Cleanup any SCTP per socket resources. */ /* Cleanup any SCTP per socket resources. */
SCTP_STATIC void sctp_destroy_sock(struct sock *sk) static void sctp_destroy_sock(struct sock *sk)
{ {
struct sctp_sock *sp; struct sctp_sock *sp;
...@@ -4028,7 +4023,7 @@ SCTP_STATIC void sctp_destroy_sock(struct sock *sk) ...@@ -4028,7 +4023,7 @@ SCTP_STATIC void sctp_destroy_sock(struct sock *sk)
* Disables further send and receive operations * Disables further send and receive operations
* and initiates the SCTP shutdown sequence. * and initiates the SCTP shutdown sequence.
*/ */
SCTP_STATIC void sctp_shutdown(struct sock *sk, int how) static void sctp_shutdown(struct sock *sk, int how)
{ {
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
struct sctp_endpoint *ep; struct sctp_endpoint *ep;
...@@ -5700,7 +5695,7 @@ static int sctp_getsockopt_assoc_stats(struct sock *sk, int len, ...@@ -5700,7 +5695,7 @@ static int sctp_getsockopt_assoc_stats(struct sock *sk, int len,
return 0; return 0;
} }
SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname, static int sctp_getsockopt(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen) char __user *optval, int __user *optlen)
{ {
int retval = 0; int retval = 0;
...@@ -6046,7 +6041,7 @@ static int sctp_get_port(struct sock *sk, unsigned short snum) ...@@ -6046,7 +6041,7 @@ static int sctp_get_port(struct sock *sk, unsigned short snum)
/* /*
* Move a socket to LISTENING state. * Move a socket to LISTENING state.
*/ */
SCTP_STATIC int sctp_listen_start(struct sock *sk, int backlog) static int sctp_listen_start(struct sock *sk, int backlog)
{ {
struct sctp_sock *sp = sctp_sk(sk); struct sctp_sock *sp = sctp_sk(sk);
struct sctp_endpoint *ep = sp->ep; struct sctp_endpoint *ep = sp->ep;
...@@ -6333,8 +6328,7 @@ static int sctp_autobind(struct sock *sk) ...@@ -6333,8 +6328,7 @@ static int sctp_autobind(struct sock *sk)
* msg_control * msg_control
* points here * points here
*/ */
SCTP_STATIC int sctp_msghdr_parse(const struct msghdr *msg, static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
sctp_cmsgs_t *cmsgs)
{ {
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
struct msghdr *my_msg = (struct msghdr *)msg; struct msghdr *my_msg = (struct msghdr *)msg;
......
...@@ -161,7 +161,7 @@ int sctp_tsnmap_mark(struct sctp_tsnmap *map, __u32 tsn, ...@@ -161,7 +161,7 @@ int sctp_tsnmap_mark(struct sctp_tsnmap *map, __u32 tsn,
/* Initialize a Gap Ack Block iterator from memory being provided. */ /* Initialize a Gap Ack Block iterator from memory being provided. */
SCTP_STATIC void sctp_tsnmap_iter_init(const struct sctp_tsnmap *map, static void sctp_tsnmap_iter_init(const struct sctp_tsnmap *map,
struct sctp_tsnmap_iter *iter) struct sctp_tsnmap_iter *iter)
{ {
/* Only start looking one past the Cumulative TSN Ack Point. */ /* Only start looking one past the Cumulative TSN Ack Point. */
...@@ -171,7 +171,7 @@ SCTP_STATIC void sctp_tsnmap_iter_init(const struct sctp_tsnmap *map, ...@@ -171,7 +171,7 @@ SCTP_STATIC void sctp_tsnmap_iter_init(const struct sctp_tsnmap *map,
/* Get the next Gap Ack Blocks. Returns 0 if there was not another block /* Get the next Gap Ack Blocks. Returns 0 if there was not another block
* to get. * to get.
*/ */
SCTP_STATIC int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map, static int sctp_tsnmap_next_gap_ack(const struct sctp_tsnmap *map,
struct sctp_tsnmap_iter *iter, struct sctp_tsnmap_iter *iter,
__u16 *start, __u16 *end) __u16 *start, __u16 *end)
{ {
......
...@@ -57,7 +57,7 @@ static void sctp_ulpevent_release_frag_data(struct sctp_ulpevent *event); ...@@ -57,7 +57,7 @@ static void sctp_ulpevent_release_frag_data(struct sctp_ulpevent *event);
/* Initialize an ULP event from an given skb. */ /* Initialize an ULP event from an given skb. */
SCTP_STATIC void sctp_ulpevent_init(struct sctp_ulpevent *event, static void sctp_ulpevent_init(struct sctp_ulpevent *event,
int msg_flags, int msg_flags,
unsigned int len) unsigned int len)
{ {
...@@ -67,7 +67,7 @@ SCTP_STATIC void sctp_ulpevent_init(struct sctp_ulpevent *event, ...@@ -67,7 +67,7 @@ SCTP_STATIC void sctp_ulpevent_init(struct sctp_ulpevent *event,
} }
/* Create a new sctp_ulpevent. */ /* Create a new sctp_ulpevent. */
SCTP_STATIC struct sctp_ulpevent *sctp_ulpevent_new(int size, int msg_flags, static struct sctp_ulpevent *sctp_ulpevent_new(int size, int msg_flags,
gfp_t gfp) gfp_t gfp)
{ {
struct sctp_ulpevent *event; struct sctp_ulpevent *event;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment