diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-11-28 17:47:03 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-11-28 17:47:03 -0600 |
| commit | fdc526e875090915228594c122de65a1e54cb5c9 (patch) | |
| tree | 2503852af3e9fa8a4444d28c3e467af16c2e1202 /nuttx/net | |
| parent | 886829ab35b22355347a553cc86aca88e6598fa4 (diff) | |
| download | px4-nuttx-fdc526e875090915228594c122de65a1e54cb5c9.tar.gz px4-nuttx-fdc526e875090915228594c122de65a1e54cb5c9.tar.bz2 px4-nuttx-fdc526e875090915228594c122de65a1e54cb5c9.zip | |
Changes for ZDS-II ez80 build
Diffstat (limited to 'nuttx/net')
| -rw-r--r-- | nuttx/net/net_close.c | 4 | ||||
| -rw-r--r-- | nuttx/net/uip/uip_tcpconn.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c index 04735f4d9..0bd5960ef 100644 --- a/nuttx/net/net_close.c +++ b/nuttx/net/net_close.c @@ -137,14 +137,14 @@ static uint16_t netclose_interrupt(FAR struct uip_driver_s *dev, #ifdef CONFIG_NET_TCP static inline void netclose_disconnect(FAR struct socket *psock) { + FAR struct uip_conn *conn; FAR struct uip_callback_s *cb; uip_lock_t flags; /* Interrupts are disabled here to avoid race conditions */ flags = uip_lock(); - - struct uip_conn *conn = (struct uip_conn*)psock->s_conn; + conn = (struct uip_conn*)psock->s_conn; /* There shouldn't be any callbacks registered */ diff --git a/nuttx/net/uip/uip_tcpconn.c b/nuttx/net/uip/uip_tcpconn.c index 348230010..6e1eb6d9d 100644 --- a/nuttx/net/uip/uip_tcpconn.c +++ b/nuttx/net/uip/uip_tcpconn.c @@ -227,7 +227,9 @@ struct uip_conn *uip_tcpalloc(void) * that is in the UIP_TIME_WAIT or UIP_FIN_WAIT_1 state. */ - struct uip_conn *tmp = g_active_tcp_connections.head; + FAR struct uip_conn *tmp = + (FAR struct uip_conn *)g_active_tcp_connections.head; + while (tmp) { nllvdbg("conn: %p state: %02x\n", tmp, tmp->tcpstateflags); @@ -252,7 +254,7 @@ struct uip_conn *uip_tcpalloc(void) /* Look at the next active connection */ - tmp = tmp->node.flink; + tmp = (FAR struct uip_conn *)tmp->node.flink; } /* Did we find a connection that we can re-use? */ |