diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-06-17 11:40:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-17 17:08:05 -0700 |
| commit | dda9192851dcf904b4d1095480834f2a4f814ae3 (patch) | |
| tree | 1dddcb3dc1458a2499aea40d9bfcac2379078926 /net/sctp/protocol.c | |
| parent | 939cfa75a0cea97aa60cb88e3722baefdceb4e72 (diff) | |
| download | linux-stable-dda9192851dcf904b4d1095480834f2a4f814ae3.tar.gz linux-stable-dda9192851dcf904b4d1095480834f2a4f814ae3.tar.bz2 linux-stable-dda9192851dcf904b4d1095480834f2a4f814ae3.zip | |
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: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/protocol.c')
| -rw-r--r-- | net/sctp/protocol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index fad7d1b67be5..57b568c38ef6 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -1312,7 +1312,7 @@ static struct pernet_operations sctp_net_ops = { }; /* Initialize the universe into something sensible. */ -SCTP_STATIC __init int sctp_init(void) +static __init int sctp_init(void) { int i; int status = -EINVAL; @@ -1499,7 +1499,7 @@ err_chunk_cachep: } /* 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 * up all the remaining associations and all that memory. |