diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-01-13 17:11:01 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-01-13 17:11:01 -0600 |
| commit | 7b7ea4c0431da13dd75cc1c2d8d032e8835fbf0e (patch) | |
| tree | 6b3281f61fca2d7ad5958527437d27d4bb67785a /nuttx/net/net_close.c | |
| parent | 7a538c3fed7116f35c6e681b6f0aac4eb5845c6b (diff) | |
| download | px4-nuttx-7b7ea4c0431da13dd75cc1c2d8d032e8835fbf0e.tar.gz px4-nuttx-7b7ea4c0431da13dd75cc1c2d8d032e8835fbf0e.tar.bz2 px4-nuttx-7b7ea4c0431da13dd75cc1c2d8d032e8835fbf0e.zip | |
The first set of changes to incorporate Jason Jiangs TCP write buffering logic
Diffstat (limited to 'nuttx/net/net_close.c')
| -rw-r--r-- | nuttx/net/net_close.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c index 42b87d2f5..d5974e51a 100644 --- a/nuttx/net/net_close.c +++ b/nuttx/net/net_close.c @@ -196,8 +196,7 @@ static uint16_t netclose_interrupt(FAR struct uip_driver_s *dev, } } -#ifdef CONFIG_NET_SOLINGER -#ifndef CONFIG_DISABLE_CLOCK +#if defined(CONFIG_NET_SOLINGER) && !defined(CONFIG_DISABLE_CLOCK) /* Check for a timeout. */ else if (pstate && close_timeout(pstate)) @@ -208,8 +207,10 @@ static uint16_t netclose_interrupt(FAR struct uip_driver_s *dev, pstate->cl_result = -ETIMEDOUT; goto end_wait; } -#endif /* CONFIG_DISABLE_CLOCK */ +#endif /* CONFIG_NET_SOLINGER && !CONFIG_DISABLE_CLOCK */ + +#ifdef CONFIG_NET_TCP_WRITE_BUFFERS /* Check if all outstanding bytes have been ACKed */ else if (pstate && conn->unacked != 0) @@ -222,7 +223,7 @@ static uint16_t netclose_interrupt(FAR struct uip_driver_s *dev, flags = (flags & ~UIP_NEWDATA); } -#endif /* CONFIG_NET_SOLINGER */ +#endif /* CONFIG_NET_TCP_WRITE_BUFFERS */ else { |