More SLIP integration

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3384 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 10 insertions, 10 deletions

diff --git a/nuttx/net/uip/uip_igmpgroup.c b/nuttx/net/uip/uip_igmpgroup.c
index af1ecd93e..076e990f9 100755
--- a/nuttx/net/uip/uip_igmpgroup.c
+++ b/nuttx/net/uip/uip_igmpgroup.c
@@ -219,7 +219,7 @@ FAR struct igmp_group_s *uip_grpalloc(FAR struct uip_driver_s *dev,
                                       FAR const uip_ipaddr_t *addr)

 {

   FAR struct igmp_group_s *group;

-  irqstate_t flags;

+  uip_lock_t flags;

 

   nllvdbg("addr: %08x dev: %p\n", *addr, dev);

   if (up_interrupt_context())

@@ -255,12 +255,12 @@ FAR struct igmp_group_s *uip_grpalloc(FAR struct uip_driver_s *dev,
 

       /* Interrupts must be disabled in order to modify the group list */

 

-      flags = irqsave();

+      flags = uip_lock();

 

       /* Add the group structure to the list in the device structure */

 

       sq_addfirst((FAR sq_entry_t*)group, &dev->grplist);

-      irqrestore(flags);

+      uip_unlock(flags);

     }

   return group;

 }

@@ -280,7 +280,7 @@ FAR struct igmp_group_s *uip_grpfind(FAR struct uip_driver_s *dev,
                                      FAR const uip_ipaddr_t *addr)

 {

   FAR struct igmp_group_s *group;

-  irqstate_t flags;

+  uip_lock_t flags;

 

   grplldbg("Searching for addr %08x\n", (int)*addr);

 

@@ -288,7 +288,7 @@ FAR struct igmp_group_s *uip_grpfind(FAR struct uip_driver_s *dev,
    * called from.

    */

 

-  flags = irqsave();

+  flags = uip_lock();

   for (group = (FAR struct igmp_group_s *)dev->grplist.head;

        group;

        group = group->next)

@@ -300,7 +300,7 @@ FAR struct igmp_group_s *uip_grpfind(FAR struct uip_driver_s *dev,
           break;

         }

     }

-  irqrestore(flags);

+  uip_unlock(flags);

   return group;

 }

 

@@ -343,13 +343,13 @@ FAR struct igmp_group_s *uip_grpallocfind(FAR struct uip_driver_s *dev,
 

 void uip_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)

 {

-  irqstate_t flags;

+  uip_lock_t flags;

 

   grplldbg("Free: %p flags: %02x\n", group, group->flags);

 

   /* Cancel the wdog */

 

-  flags = irqsave();

+  flags = uip_lock();

   wd_cancel(group->wdog);

   

   /* Remove the group structure from the group list in the device structure */

@@ -373,7 +373,7 @@ void uip_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
     {

       grplldbg("Put back on free list\n");

       sq_addlast((FAR sq_entry_t*)group, &g_freelist);

-      irqrestore(flags);

+      uip_unlock(flags);

     }

   else

 #endif

@@ -382,7 +382,7 @@ void uip_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
        * this function is executing within an interrupt handler.

        */

 

-      irqrestore(flags);

+      uip_unlock(flags);

       grplldbg("Call sched_free()\n");

       sched_free(group);

     }