From c250c971863e2f84936a4e802f9ab54e14e082da Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 27 Jan 2015 14:26:10 -0600
Subject: [PATCH] Unix domain: More fixed to build without Ethernet or Slip

---
 arch/sim/src/up_idle.c       |  2 +-
 arch/sim/src/up_initialize.c |  2 +-
 net/devif/devif_poll.c       |  4 ++--
 net/netdev/netdev_register.c |  2 +-
 net/socket/recvfrom.c        | 38 ++++++++++++++++++++++++------------
 5 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/arch/sim/src/up_idle.c b/arch/sim/src/up_idle.c
index ae7c2d7040d..3cc7875b993 100644
--- a/arch/sim/src/up_idle.c
+++ b/arch/sim/src/up_idle.c
@@ -117,7 +117,7 @@ void up_idle(void)
 #endif
 
 
-#ifdef CONFIG_NET
+#ifdef CONFIG_NET_ETHERNET
   /* Run the network if enabled */
 
   netdriver_loop();
diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c
index 6ae39f94ae9..82eb32d1cec 100644
--- a/arch/sim/src/up_initialize.c
+++ b/arch/sim/src/up_initialize.c
@@ -158,7 +158,7 @@ void up_initialize(void)
   up_registerblockdevice(); /* Our FAT ramdisk at /dev/ram0 */
 #endif
 
-#ifdef CONFIG_NET
+#ifdef CONFIG_NET_ETHERNET
   netdriver_init();         /* Our "real" network driver */
 #endif
 
diff --git a/net/devif/devif_poll.c b/net/devif/devif_poll.c
index 3070584b616..c942ea266f2 100644
--- a/net/devif/devif_poll.c
+++ b/net/devif/devif_poll.c
@@ -313,7 +313,7 @@ static inline int devif_poll_tcp_timer(FAR struct net_driver_s *dev,
 
 int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
 {
-  int bstop;
+  int bstop = false;
 
   /* Traverse all of the active packet connections and perform the poll
    * action.
@@ -417,7 +417,7 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback)
 int devif_timer(FAR struct net_driver_s *dev, devif_poll_callback_t callback,
                 int hsec)
 {
-  int bstop;
+  int bstop = false;
 
   /* Increment the timer used by the IP reassembly logic */
 
diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c
index 1f9ff501e3c..464eef16c16 100644
--- a/net/netdev/netdev_register.c
+++ b/net/netdev/netdev_register.c
@@ -65,7 +65,7 @@
 
 #if defined(CONFIG_NET_SLIP)
 #  define NETDEV_DEFAULT_FORMAT NETDEV_SLIP_FORMAT
-#elif defined(CONFIG_NET_ETHERNET)
+#else /* `if defined(CONFIG_NET_ETHERNET) */
 #  define NETDEV_DEFAULT_FORMAT NETDEV_ETH_FORMAT
 #endif
 
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index 61733d57498..8e38d78817b 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -1615,23 +1615,37 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
       /* Get the minimum socket length */
 
-#ifdef CONFIG_NET_IPv4
-#ifdef CONFIG_NET_IPv6
-      if (psock->s_domain == PF_INET)
-#endif
+      switch (psock->s_domain)
         {
-          minlen = sizeof(struct sockaddr_in);
-        }
-#endif /*CONFIG_NET_IPv4 */
+#ifdef CONFIG_NET_IPv4
+        case PF_INET:
+          {
+            minlen = sizeof(struct sockaddr_in);
+          }
+          break;
+#endif
 
 #ifdef CONFIG_NET_IPv6
-#ifdef CONFIG_NET_IPv4
-      else
+        case PF_INET6:
+          {
+            minlen = sizeof(struct sockaddr_in6);
+          }
+          break;
 #endif
-        {
-          minlen = sizeof(struct sockaddr_in6);
+
+#ifdef CONFIG_NET_LOCAL
+        case PF_LOCAL:
+          {
+            minlen = sizeof(sa_family_t);
+          }
+          break;
+#endif
+
+        default:
+          DEBUGPANIC();
+          err = EINVAL;
+          goto errout;
         }
-#endif /*CONFIG_NET_IPv6 */
 
       if (*fromlen < minlen)
         {