More support for SLIP data link protocol

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3370 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 19 insertions, 1 deletions

diff --git a/nuttx/include/net/uip/uip-arp.h b/nuttx/include/net/uip/uip-arp.h
index 439960e9a..3afe1b252 100644
--- a/nuttx/include/net/uip/uip-arp.h
+++ b/nuttx/include/net/uip/uip-arp.h
@@ -2,7 +2,7 @@
  * include/net/uip/uip-arch.h
  * Macros and definitions for the ARP module.
  *
- *   Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Derived from uIP with has a similar BSD-styple license:
@@ -49,7 +49,9 @@
 #include <nuttx/compiler.h>
 
 #include <stdint.h>
+
 #include <net/ethernet.h>
+#include <net/uip/uipopt.h>
 #include <net/uip/uip.h>
 
 /****************************************************************************
@@ -102,6 +104,7 @@ extern "C" {
  * Public Function Prototypes
  ****************************************************************************/
 
+#ifdef CONFIG_NET_ARP
 /****************************************************************************
  * Name: uip_arp_init
  *
@@ -236,6 +239,21 @@ EXTERN struct arp_entry *uip_arp_find(in_addr_t ipaddr);
     } \
 }
 
+#else /* CONFIG_NET_ARP */
+
+/* If ARP is disabled, stub out all ARP interfaces */
+
+# define uip_arp_init()
+# define uip_arp_ipin(dev)
+# define uip_arp_arpin(dev)
+# define uip_arp_out(dev)
+# define uip_arp_timer()
+# define uip_arp_update(pipaddr,ethaddr)
+# define uip_arp_find(ipaddr) NULL
+# define uip_arp_delete(ipaddr)
+
+#endif /* CONFIG_NET_ARP */
+
 #undef EXTERN
 #ifdef __cplusplus
 }