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

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

include/net/sctp/sctp.h

+0 −8
Original line number Diff line number Diff line
@@ -99,14 +99,6 @@ 
#define SCTP_PROTOSW_FLAG INET_PROTOSW_PERMANENT

#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.

 */

net/sctp/chunk.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void sctp_datamsg_init(struct sctp_datamsg *msg) 
}



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

	msg = kmalloc(sizeof(struct sctp_datamsg), gfp);

net/sctp/input.c

+2 −2
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ hit: 
}



/* Look up an association. BH-safe. */

SCTP_STATIC

static

struct sctp_association *sctp_lookup_association(struct net *net,

						 const union sctp_addr *laddr,

						 const union sctp_addr *paddr,

net/sctp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static struct notifier_block sctp_inet6addr_notifier = { 
};



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

{

	struct inet6_dev *idev;

net/sctp/protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE