diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-09-18 03:00:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-09-18 03:00:26 +0000 |
| commit | 0580aad17f754a1438772dc2db396f4401d874be (patch) | |
| tree | 37d1b058ba03dd2801bdd3b815048d35fb9bcf94 /nuttx/net | |
| parent | 9e15c4be04516ac9957f33ea179a188cc2a081a0 (diff) | |
| download | px4-nuttx-0580aad17f754a1438772dc2db396f4401d874be.tar.gz px4-nuttx-0580aad17f754a1438772dc2db396f4401d874be.tar.bz2 px4-nuttx-0580aad17f754a1438772dc2db396f4401d874be.zip | |
Fixed for CYGWIN build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@346 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
| -rw-r--r-- | nuttx/net/send.c | 6 | ||||
| -rw-r--r-- | nuttx/net/socket.c | 2 | ||||
| -rw-r--r-- | nuttx/net/uip/uip.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/nuttx/net/send.c b/nuttx/net/send.c index 57e19ade7..dc5dbc75b 100644 --- a/nuttx/net/send.c +++ b/nuttx/net/send.c @@ -165,12 +165,14 @@ static void send_interrupt(struct uip_driver_s *dev, void *private) { /* Stop further callbacks */ - uip_udp_conn->private = NULL; - uip_udp_conn->event = NULL; + conn = (struct uip_conn *)pstate->snd_sock->s_conn; + conn->data_private = NULL; + conn->data_event = NULL; /* Report not connected */ pstate->snd_sent = -ENOTCONN; + /* Wake up the waiting thread */ sem_post(&pstate->snd_sem); diff --git a/nuttx/net/socket.c b/nuttx/net/socket.c index b35c8e866..5efc86df9 100644 --- a/nuttx/net/socket.c +++ b/nuttx/net/socket.c @@ -88,9 +88,7 @@ int socket(int domain, int type, int protocol) { -#ifdef CONFIG_NET_UDP FAR struct socket *psock; -#endif int sockfd; int err; diff --git a/nuttx/net/uip/uip.c b/nuttx/net/uip/uip.c index 677cf64db..49536fa41 100644 --- a/nuttx/net/uip/uip.c +++ b/nuttx/net/uip/uip.c @@ -372,7 +372,9 @@ void uip_init(void) /* Initialize the UDP connection structures */ +#ifdef CONFIG_NET_UDP uip_udpinit(); +#endif /* IPv4 initialization. */ } @@ -561,6 +563,7 @@ static void uip_add_rcv_nxt(uint16 n) uip_conn->rcv_nxt[3] = uip_acc32[3]; } +#ifdef CONFIG_NET_UDP static void uip_udp_callback(struct uip_driver_s *dev) { /* Some sanity checking */ @@ -572,6 +575,7 @@ static void uip_udp_callback(struct uip_driver_s *dev) uip_udp_conn->event(dev, uip_udp_conn->private); } } +#endif static void uip_tcp_callback(struct uip_driver_s *dev) { |