diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-13 20:51:48 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-13 20:51:48 +0000 |
| commit | 4db6969af9fbe458d1d7d68bb2c918bc97e88c4d (patch) | |
| tree | 5dfb25820fab1a8ed236e564e12fdfec3c218470 /nuttx/net/uip/uip_lock.c | |
| parent | 9be0c168895dae40d5818514813d4ba39b14186f (diff) | |
| download | px4-nuttx-4db6969af9fbe458d1d7d68bb2c918bc97e88c4d.tar.gz px4-nuttx-4db6969af9fbe458d1d7d68bb2c918bc97e88c4d.tar.bz2 px4-nuttx-4db6969af9fbe458d1d7d68bb2c918bc97e88c4d.zip | |
Fix a deadlock when using the NSH ifconfig command over Telnet
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4487 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net/uip/uip_lock.c')
| -rw-r--r-- | nuttx/net/uip/uip_lock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/net/uip/uip_lock.c b/nuttx/net/uip/uip_lock.c index 7ba5f88a0..0e770cef7 100644 --- a/nuttx/net/uip/uip_lock.c +++ b/nuttx/net/uip/uip_lock.c @@ -1,8 +1,8 @@ /**************************************************************************** * net/uip/uip_lock.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -173,7 +173,7 @@ void uip_unlock(uip_lock_t flags) * Function: uip_lockedwait * * Description: - * Atomically wait for sem while temporarilty releasing. + * Atomically wait for sem while temporarily releasing g_uipsem. * ****************************************************************************/ @@ -195,7 +195,7 @@ int uip_lockedwait(sem_t *sem) g_count = 0; sem_post(&g_uipsem); - /* Now take semaphore */ + /* Now take the semaphore */ ret = sem_wait(sem); |