summaryrefslogtreecommitdiff
path: root/nuttx/net
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-16 02:10:51 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-16 02:10:51 +0000
commit476f7ff06ef2561761015980c30e8fbfe0a7f8cf (patch)
treea5c3a9c2898c3895c3bc26368ad6f501575cb02d /nuttx/net
parent83b74ef7bf58f8f26dc2f70e4a68b9f240b1fb99 (diff)
downloadpx4-nuttx-476f7ff06ef2561761015980c30e8fbfe0a7f8cf.tar.gz
px4-nuttx-476f7ff06ef2561761015980c30e8fbfe0a7f8cf.tar.bz2
px4-nuttx-476f7ff06ef2561761015980c30e8fbfe0a7f8cf.zip
SLIP is now basically functional
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3386 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
-rw-r--r--nuttx/net/send.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/nuttx/net/send.c b/nuttx/net/send.c
index b1583f5b3..1b4407db1 100644
--- a/nuttx/net/send.c
+++ b/nuttx/net/send.c
@@ -277,8 +277,7 @@ static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn,
* should already be in the ARP table.
*/
-#ifdef CONFIG_NET_ETHERNET
-#ifndef CONFIG_NET_ARP_IPIN
+#if defined(CONFIG_NET_ETHERNET) && defined (CONFIG_NET_ARP_IPIN)
if (pstate->snd_sent != 0 || uip_arp_find(conn->ripaddr) != NULL)
#endif
{
@@ -294,7 +293,6 @@ static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn,
pstate->snd_time = g_system_timer;
#endif
}
-#endif /* CONFIG_NET_ETHERNET */
}
/* All data has been send and we are just waiting for ACK or re-transmit