From c3c8f8ed312aa49417d84ec8cae6311784f7282f Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 28 Mar 2017 16:14:58 -0600
Subject: [PATCH] 6loWPAN: Simplify some logic in send() if there is only an
 IEEE802.15.4 MAC

---
 net/socket/send.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/net/socket/send.c b/net/socket/send.c
index 20252fcdaeb..fd37860a1a1 100644
--- a/net/socket/send.c
+++ b/net/socket/send.c
@@ -164,13 +164,22 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len,
               /* Try 6loWPAN TCP packet send */
 
               ret = psock_6lowpan_tcp_send(psock, buf, len);
+
+#ifdef CONFIG_NETDEV_MULTINIC
               if (ret < 0)
-#endif
                 {
-                  /* Try TCP/IP packet send */
+                  /* UDP/IP packet send */
 
                   ret = psock_tcp_send(psock, buf, len);
                 }
+
+#endif /* CONFIG_NETDEV_MULTINIC */
+#else  /* CONFIG_NET_6LOWPAN */
+
+              /* Only TCP/IP packet send */
+
+              ret = psock_tcp_send(psock, buf, len);
+#endif /* CONFIG_NET_6LOWPAN */
             }
 #endif /* CONFIG_NET_TCP */
         }
@@ -200,13 +209,22 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len,
               /* Try 6loWPAN UDP packet send */
 
               ret = psock_6lowpan_udp_send(psock, buf, len);
+
+#ifdef CONFIG_NETDEV_MULTINIC
               if (ret < 0)
-#endif
                 {
                   /* UDP/IP packet send */
 
                   ret = psock_udp_send(psock, buf, len);
                 }
+
+#endif /* CONFIG_NETDEV_MULTINIC */
+#else  /* CONFIG_NET_6LOWPAN */
+
+              /* Only UDP/IP packet send */
+
+              ret = psock_udp_send(psock, buf, len);
+#endif /* CONFIG_NET_6LOWPAN */
             }
 #endif /* CONFIG_NET_UDP */
         }