From 9b252871523e98d042593a60b5174e929bcef02d Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 12 Mar 2013 13:39:47 +0800 Subject: [PATCH] --- yaml --- r: 366286 b: refs/heads/master c: 3b77d6617a68dbcafc9cc95d80522c3b0c00ad80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/sctp/sctp.h | 2 +- trunk/net/sctp/protocol.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d7b76eecf052..aebaab491625 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e51c9ff6a5f37c4baf3dfab579e8aed33b8f427 +refs/heads/master: 3b77d6617a68dbcafc9cc95d80522c3b0c00ad80 diff --git a/trunk/include/net/sctp/sctp.h b/trunk/include/net/sctp/sctp.h index df85a0c0f2d5..cd89510eab2a 100644 --- a/trunk/include/net/sctp/sctp.h +++ b/trunk/include/net/sctp/sctp.h @@ -576,7 +576,7 @@ for (pos = chunk->subh.fwdtsn_hdr->skip;\ #define WORD_ROUND(s) (((s)+3)&~3) /* Make a new instance of type. */ -#define t_new(type, flags) (type *)kzalloc(sizeof(type), flags) +#define t_new(type, flags) kzalloc(sizeof(type), flags) /* Compare two timevals. */ #define tv_lt(s, t) \ diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c index 1c2e46cb9191..eaee00c61139 100644 --- a/trunk/net/sctp/protocol.c +++ b/trunk/net/sctp/protocol.c @@ -1403,7 +1403,7 @@ SCTP_STATIC __init int sctp_init(void) /* Allocate and initialize the endpoint hash table. */ sctp_ep_hashsize = 64; - sctp_ep_hashtable = (struct sctp_hashbucket *) + sctp_ep_hashtable = kmalloc(64 * sizeof(struct sctp_hashbucket), GFP_KERNEL); if (!sctp_ep_hashtable) { pr_err("Failed endpoint_hash alloc\n");