3 files changed, 11 insertions, 19 deletions
diff --git a/nuttx/include/net/uip/uip-arch.h b/nuttx/include/net/uip/uip-arch.h
index f49448da2..e0cbb84f2 100644
--- a/nuttx/include/net/uip/uip-arch.h
+++ b/nuttx/include/net/uip/uip-arch.h
@@ -69,9 +69,9 @@
 #define UIP_POLL_REQUEST  3 /* Tells uIP that a connection should be polled. */
 #define UIP_UDP_SEND_CONN 4 /* Tells uIP that a UDP datagram should be constructed in the
                              * uip_buf buffer. */
-#if UIP_UDP
+ #ifdef CONFIG_NET_UDP
 # define UIP_UDP_TIMER    5
-#endif /* UIP_UDP */
+#endif  /* CONFIG_NET_UDP */
 
 /* uIP device driver functions
  *
@@ -194,7 +194,7 @@
 #define uip_poll_conn(conn) do { uip_conn = conn; uip_interrupt(UIP_POLL_REQUEST); } while (0)
 
 
-#if UIP_UDP
+ #ifdef CONFIG_NET_UDP
 /* Periodic processing for a UDP connection identified by its number.
  *
  * This function is essentially the same as uip_periodic(), but for
@@ -241,7 +241,7 @@
                                          uip_interrupt(UIP_UDP_TIMER); } while (0)
 
 
-#endif /* UIP_UDP */
+#endif  /* CONFIG_NET_UDP */
 
 /****************************************************************************
  * Public Types
diff --git a/nuttx/include/net/uip/uip.h b/nuttx/include/net/uip/uip.h
index eddae8a66..d0ed0dd3f 100644
--- a/nuttx/include/net/uip/uip.h
+++ b/nuttx/include/net/uip/uip.h
@@ -187,7 +187,7 @@ struct uip_conn
   void *private;
 };
 
-#if UIP_UDP
+ #ifdef CONFIG_NET_UDP
 /* Representation of a uIP UDP connection. */
 
 struct uip_udp_conn
@@ -203,7 +203,7 @@ struct uip_udp_conn
 
   void *private;
 };
-#endif /* UIP_UDP */
+#endif  /* CONFIG_NET_UDP */
 
 /**
  * The structure holding the TCP/IP statistics that are gathered if
@@ -247,14 +247,14 @@ struct uip_stats {
     uip_stats_t synrst;   /* Number of SYNs for closed ports,
                              triggering a RST. */
   } tcp;                  /* TCP statistics. */
-#if UIP_UDP
+ #ifdef CONFIG_NET_UDP
   struct {
     uip_stats_t drop;     /* Number of dropped UDP segments. */
     uip_stats_t recv;     /* Number of recived UDP segments. */
     uip_stats_t sent;     /* Number of sent UDP segments. */
     uip_stats_t chkerr;   /* Number of UDP segments with a bad checksum. */
   } udp;                  /* UDP statistics. */
-#endif /* UIP_UDP */
+#endif  /* CONFIG_NET_UDP */
 };
 
 /* The TCP and IP headers. */
@@ -471,10 +471,10 @@ extern uint8 uip_acc32[4];
 
 /* The current UDP connection. */
 
-#if UIP_UDP
+ #ifdef CONFIG_NET_UDP
 extern struct uip_udp_conn *uip_udp_conn;
 extern struct uip_udp_conn uip_udp_conns[UIP_UDP_CONNS];
-#endif /* UIP_UDP */
+#endif  /* CONFIG_NET_UDP */
 
 /* The uIP TCP/IP statistics.
  *
@@ -601,7 +601,7 @@ void uip_setipid(uint16 id);
  */
 
 void uip_interrupt_event(void);
-#if UIP_UDP
+ #ifdef CONFIG_NET_UDP
 void uip_interrupt_udp_event(void);
 #endif
 
diff --git a/nuttx/include/net/uip/uipopt.h b/nuttx/include/net/uip/uipopt.h
index 5d19c778e..3a381729a 100644
--- a/nuttx/include/net/uip/uipopt.h
+++ b/nuttx/include/net/uip/uipopt.h
@@ -145,14 +145,6 @@
 
 /* UDP configuration options */
 
-/* Toggles wether UDP support should be compiled in or not. */
-
-#ifdef CONFIG_NET_UDP
-# define UIP_UDP CONFIG_NET_UDP
-#else /* CONFIG_NET_UDP */
-# define UIP_UDP           0
-#endif /* CONFIG_NET_UDP */
-
 /* Toggles if UDP checksums should be used or not.
  *
  * Note: Support for UDP checksums is currently not included in uIP,