diff options
author | David S. Miller <davem@davemloft.net> | 2010-05-03 19:20:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-03 19:24:31 -0400 |
commit | f5460618405eec8c3300947a499011528a115acd (patch) | |
tree | 19aba5acb6d91d5a20400292aaf1881a6b26c118 /net/sctp/endpointola.c | |
parent | 4f70ecca9c57731b4acbe5043eb22e4416bd2368 (diff) | |
parent | 0e3aef8d09a8c11e3fb83cdcb24b5bc7421b3726 (diff) |
Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
Add missing linux/vmalloc.h include to net/sctp/probe.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/endpointola.c')
-rw-r--r-- | net/sctp/endpointola.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 7ec09ba03a1c..e10acc01c75f 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c | |||
@@ -70,8 +70,6 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, | |||
70 | struct sctp_shared_key *null_key; | 70 | struct sctp_shared_key *null_key; |
71 | int err; | 71 | int err; |
72 | 72 | ||
73 | memset(ep, 0, sizeof(struct sctp_endpoint)); | ||
74 | |||
75 | ep->digest = kzalloc(SCTP_SIGNATURE_SIZE, gfp); | 73 | ep->digest = kzalloc(SCTP_SIGNATURE_SIZE, gfp); |
76 | if (!ep->digest) | 74 | if (!ep->digest) |
77 | return NULL; | 75 | return NULL; |