diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-01-14 09:43:59 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-01-14 09:43:59 -0600 |
| commit | 37a1adc0053c37b3bc70379f489f93359724186a (patch) | |
| tree | 704748a5735f9f304ca278c8236840d41712cffd /nuttx/include | |
| parent | 98a3d56a2faac2bb5301d8c47f11749614ba3e77 (diff) | |
| download | px4-nuttx-37a1adc0053c37b3bc70379f489f93359724186a.tar.gz px4-nuttx-37a1adc0053c37b3bc70379f489f93359724186a.tar.bz2 px4-nuttx-37a1adc0053c37b3bc70379f489f93359724186a.zip | |
Changes to correct TCP write buffereing build errors
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/net/net.h | 8 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/uip/uip-tcp.h | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index 7970ad7fc..dffa47592 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -90,19 +90,23 @@ struct socket int s_crefs; /* Reference count on the socket */ uint8_t s_type; /* Protocol type: Only SOCK_STREAM or SOCK_DGRAM */ uint8_t s_flags; /* See _SF_* definitions */ + + /* Socket options */ + #ifdef CONFIG_NET_SOCKOPTS sockopt_t s_options; /* Selected socket options */ #ifndef CONFIG_DISABLE_CLOCK socktimeo_t s_rcvtimeo; /* Receive timeout value (in deciseconds) */ socktimeo_t s_sndtimeo; /* Send timeout value (in deciseconds) */ -#endif #ifdef CONFIG_NET_SOLINGER socktimeo_t s_linger; /* Linger timeout value (in deciseconds) */ #endif #endif +#endif + FAR void *s_conn; /* Connection: struct uip_conn or uip_udp_conn */ -#ifdef CONFIG_NET_TCP_WRBUFFER +#ifdef CONFIG_NET_NTCP_WRITE_BUFFERS /* Callback instance for TCP send */ FAR struct uip_callback_s *s_sndcb; diff --git a/nuttx/include/nuttx/net/uip/uip-tcp.h b/nuttx/include/nuttx/net/uip/uip-tcp.h index c14686822..55d281cc0 100644 --- a/nuttx/include/nuttx/net/uip/uip-tcp.h +++ b/nuttx/include/nuttx/net/uip/uip-tcp.h @@ -162,7 +162,7 @@ struct uip_conn uint16_t mss; /* Current maximum segment size for the * connection */ uint16_t winsize; /* Current window size of the connection */ -#ifdef CONFIG_NET_TCP_WRBUFFER +#ifdef CONFIG_NET_NTCP_WRITE_BUFFERS uint32_t unacked; /* Number bytes sent but not yet ACKed */ #else uint16_t unacked; /* Number bytes sent but not yet ACKed */ @@ -431,16 +431,17 @@ int uip_unlisten(struct uip_conn *conn); /* Access to TCP read-ahead buffers */ #ifdef CONFIG_NET_TCP_READAHEAD -struct uip_readahead_s *uip_tcpreadaheadalloc(void); -void uip_tcpreadaheadrelease(struct uip_readahead_s *buf); +FAR struct uip_readahead_s *uip_tcpreadahead_alloc(void); +void uip_tcpreadahead_release(FAR struct uip_readahead_s *readahead); #endif /* CONFIG_NET_TCP_READAHEAD */ /* Access to TCP write buffers */ #ifdef CONFIG_NET_TCP_WRITE_BUFFERS +struct timespec; FAR struct uip_wrbuffer_s *uip_tcpwrbuffer_alloc(FAR const struct timespec *abstime); -void uip_tcpwrbuffer_release(FAR struct uip_wrbuffer_s *buf); -#endif /* CONFIG_NET_NTCP_READAHEAD_BUFFERS */ +void uip_tcpwrbuffer_release(FAR struct uip_wrbuffer_s *wrbuffer); +#endif /* CONFIG_NET_TCP_WRITE_BUFFERS */ /* Backlog support */ |