summaryrefslogtreecommitdiff
path: root/nuttx/net/uip/uip_igmpgroup.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-09 21:12:20 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-09 21:12:20 +0000
commitdda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5 (patch)
tree0af32db840a032a50312791977b7d129def1d5b3 /nuttx/net/uip/uip_igmpgroup.c
parent2ac33dcffabd9422659c3b013ed8624c09ae90e4 (diff)
downloadpx4-nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.tar.gz
px4-nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.tar.bz2
px4-nuttx-dda5be5c1fc672b5d9cb3a910b5e0cb0a41046c5.zip
More changes for a kernel-mode allocator (more to be done)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5724 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net/uip/uip_igmpgroup.c')
-rw-r--r--nuttx/net/uip/uip_igmpgroup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/net/uip/uip_igmpgroup.c b/nuttx/net/uip/uip_igmpgroup.c
index b92db5476..a530f954c 100644
--- a/nuttx/net/uip/uip_igmpgroup.c
+++ b/nuttx/net/uip/uip_igmpgroup.c
@@ -2,7 +2,7 @@
* net/uip/uip_igmpgroup.c
* IGMP group data structure management logic
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* The NuttX implementation of IGMP was inspired by the IGMP add-on for the
@@ -114,7 +114,7 @@
* Private Data
****************************************************************************/
-/* malloc() cannot be called from an interrupt handler. To work around this,
+/* kmalloc() 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.
*/
@@ -139,13 +139,13 @@ static FAR sq_queue_t g_freelist;
* Allocate a new group from heap memory.
*
* Assumptions:
- * Calls malloc and so cannot be called from an interrupt handler.
+ * Calls kmalloc and so cannot be called from an interrupt handler.
*
****************************************************************************/
static inline FAR struct igmp_group_s *uip_grpheapalloc(void)
{
- return (FAR struct igmp_group_s *)zalloc(sizeof(struct igmp_group_s));
+ return (FAR struct igmp_group_s *)kzalloc(sizeof(struct igmp_group_s));
}
/****************************************************************************