diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-21 14:11:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-21 14:11:14 +1100 |
| commit | 12656abe40e8906fea487caf97b6eff795874299 (patch) | |
| tree | 3690f29426d54c10d1ebbf87fd4331b625d47478 /net | |
| parent | 93fb6437715f2d9356620e14c758362b7d0ebcb5 (diff) | |
| parent | 07f42258893d3768deb9a24165d23f1355bc1949 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/virtual/virtio-spec.txt
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/protocol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 1c2e46cb9191..eaee00c61139 100644 --- a/net/sctp/protocol.c +++ b/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"); |