summaryrefslogtreecommitdiff
path: root/nuttx/net
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-31 17:26:36 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-31 17:26:36 -0600
commit39c90ce1ce01a0b45451df19c1635240d47aaf29 (patch)
tree3814c0a5ce1961e161e268801e0529a926100ffb /nuttx/net
parente4f3869daedaf22dd224285cc7f0373e0a5025d2 (diff)
downloadnuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.tar.gz
nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.tar.bz2
nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.zip
Rename kmalloc to kmm_malloc for consistency
Diffstat (limited to 'nuttx/net')
-rw-r--r--nuttx/net/igmp/igmp_group.c4
-rw-r--r--nuttx/net/socket/net_poll.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c
index fba472757..632c29fc4 100644
--- a/nuttx/net/igmp/igmp_group.c
+++ b/nuttx/net/igmp/igmp_group.c
@@ -116,7 +116,7 @@
* Private Data
****************************************************************************/
-/* kmalloc() cannot be called from an interrupt handler. To work around this,
+/* kmm_malloc() cannot be called from an interrupt handler. To work around this,
* a small number of IGMP groups are preallocated just for use in interrupt
* handling logic.
*/
@@ -141,7 +141,7 @@ static FAR sq_queue_t g_freelist;
* Allocate a new group from heap memory.
*
* Assumptions:
- * Calls kmalloc and so cannot be called from an interrupt handler.
+ * Calls kmm_malloc and so cannot be called from an interrupt handler.
*
****************************************************************************/
diff --git a/nuttx/net/socket/net_poll.c b/nuttx/net/socket/net_poll.c
index f60df2366..37f990bd2 100644
--- a/nuttx/net/socket/net_poll.c
+++ b/nuttx/net/socket/net_poll.c
@@ -200,7 +200,7 @@ static inline int net_pollsetup(FAR struct socket *psock,
/* Allocate a container to hold the poll information */
- info = (FAR struct net_poll_s *)kmalloc(sizeof(struct net_poll_s));
+ info = (FAR struct net_poll_s *)kmm_malloc(sizeof(struct net_poll_s));
if (!info)
{
return -ENOMEM;