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

net: sctp: get rid of t_new macro for kzalloc 



t_new rather obfuscates things where everyone else is using actual
function names instead of that macro, so replace it with kzalloc,
which is the function t_new wraps.

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 32bc9b46

include/net/sctp/sctp.h

+0 −3
Original line number Diff line number Diff line
@@ -575,9 +575,6 @@ for (pos = chunk->subh.fwdtsn_hdr->skip;\ 
/* Round an int up to the next multiple of 4.  */

#define WORD_ROUND(s) (((s)+3)&~3)



/* Make a new instance of type.  */

#define t_new(type, flags)	kzalloc(sizeof(type), flags)



/* Compare two timevals.  */

#define tv_lt(s, t) \

   (s.tv_sec < t.tv_sec || (s.tv_sec == t.tv_sec && s.tv_usec < t.tv_usec))

net/sctp/associola.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ struct sctp_association *sctp_association_new(const struct sctp_endpoint *ep, 
{

	struct sctp_association *asoc;



	asoc = t_new(struct sctp_association, gfp);

	asoc = kzalloc(sizeof(*asoc), gfp);

	if (!asoc)

		goto fail;

net/sctp/bind_addr.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new, 
	struct sctp_sockaddr_entry *addr;



	/* Add the address to the bind address list.  */

	addr = t_new(struct sctp_sockaddr_entry, gfp);

	addr = kzalloc(sizeof(*addr), gfp);

	if (!addr)

		return -ENOMEM;

net/sctp/endpointola.c

+2 −1
Original line number Diff line number Diff line
@@ -192,9 +192,10 @@ struct sctp_endpoint *sctp_endpoint_new(struct sock *sk, gfp_t gfp) 
	struct sctp_endpoint *ep;



	/* Build a local endpoint. */

	ep = t_new(struct sctp_endpoint, gfp);

	ep = kzalloc(sizeof(*ep), gfp);

	if (!ep)

		goto fail;



	if (!sctp_endpoint_init(ep, sk, gfp))

		goto fail_init;

net/sctp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist, 
	read_lock_bh(&in6_dev->lock);

	list_for_each_entry(ifp, &in6_dev->addr_list, if_list) {

		/* Add the address to the local list.  */

		addr = t_new(struct sctp_sockaddr_entry, GFP_ATOMIC);

		addr = kzalloc(sizeof(*addr), GFP_ATOMIC);

		if (addr) {

			addr->a.v6.sin6_family = AF_INET6;

			addr->a.v6.sin6_port = 0;