aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorKris Katterjohn <kjak@users.sourceforge.net>2006-01-11 18:56:43 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-11 19:32:14 -0500
commit8b3a70058bfe711b2d05ba2134178bae623183ce (patch)
tree6f9e55729938f0a935aa885d29d5a38537fa3a97 /net/sctp
parentae0f7d5f83236a43c572a744e4bbb30e8702d821 (diff)
[NET]: Remove more unneeded typecasts on *malloc()
This removes more unneeded casts on the return value for kmalloc(), sock_kmalloc(), and vmalloc(). Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/sm_make_chunk.c2
-rw-r--r--net/sctp/socket.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index f9573eba5c7a..556c495c6922 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1287,7 +1287,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
1287 - (bodysize % SCTP_COOKIE_MULTIPLE); 1287 - (bodysize % SCTP_COOKIE_MULTIPLE);
1288 *cookie_len = headersize + bodysize; 1288 *cookie_len = headersize + bodysize;
1289 1289
1290 retval = (sctp_cookie_param_t *)kmalloc(*cookie_len, GFP_ATOMIC); 1290 retval = kmalloc(*cookie_len, GFP_ATOMIC);
1291 1291
1292 if (!retval) { 1292 if (!retval) {
1293 *cookie_len = 0; 1293 *cookie_len = 0;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index fc04d185fa33..a268eab68ca1 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -860,7 +860,7 @@ SCTP_STATIC int sctp_setsockopt_bindx(struct sock* sk,
860 return -EFAULT; 860 return -EFAULT;
861 861
862 /* Alloc space for the address array in kernel memory. */ 862 /* Alloc space for the address array in kernel memory. */
863 kaddrs = (struct sockaddr *)kmalloc(addrs_size, GFP_KERNEL); 863 kaddrs = kmalloc(addrs_size, GFP_KERNEL);
864 if (unlikely(!kaddrs)) 864 if (unlikely(!kaddrs))
865 return -ENOMEM; 865 return -ENOMEM;
866 866
@@ -1150,7 +1150,7 @@ SCTP_STATIC int sctp_setsockopt_connectx(struct sock* sk,
1150 return -EFAULT; 1150 return -EFAULT;
1151 1151
1152 /* Alloc space for the address array in kernel memory. */ 1152 /* Alloc space for the address array in kernel memory. */
1153 kaddrs = (struct sockaddr *)kmalloc(addrs_size, GFP_KERNEL); 1153 kaddrs = kmalloc(addrs_size, GFP_KERNEL);
1154 if (unlikely(!kaddrs)) 1154 if (unlikely(!kaddrs))
1155 return -ENOMEM; 1155 return -ENOMEM;
1156 1156