diff --git a/net/sixlowpan/sixlowpan_internal.h b/net/sixlowpan/sixlowpan_internal.h
index 8f3e52dfd3..d6a795c554 100644
--- a/net/sixlowpan/sixlowpan_internal.h
+++ b/net/sixlowpan/sixlowpan_internal.h
@@ -446,6 +446,7 @@ extern struct rimeaddr_s g_pktaddrs[PACKETBUF_NUM_ADDRS];
 
 struct net_driver_s;         /* Forward reference */
 struct ieee802154_driver_s;  /* Forward reference */
+struct devif_callback_s;     /* Forward reference */
 struct ipv6_hdr_s;           /* Forward reference */
 struct rimeaddr_s;           /* Forward reference */
 struct iob_s;                /* Forward reference */
@@ -466,7 +467,8 @@ struct iob_s;                /* Forward reference */
  *
  * Input Parameters:
  *   dev     - The IEEE802.15.4 MAC network driver interface.
- *   destip  - IPv6 plus TCP or UDP headers.
+ *   list    - Head of callback list for send interrupt
+ *   ipv6hdr - IPv6 plus TCP or UDP headers.
  *   buf     - Data to send
  *   buflen  - Length of data to send
  *   raddr   - The MAC address of the destination
@@ -484,7 +486,8 @@ struct iob_s;                /* Forward reference */
  ****************************************************************************/
 
 int sixlowpan_send(FAR struct net_driver_s *dev,
-                   FAR const struct ipv6_hdr_s *destip, FAR const void *buf,
+                   FAR struct devif_callback_s **list,
+                   FAR const struct ipv6_hdr_s *ipv6hdr, FAR const void *buf,
                    size_t buflen, FAR const struct rimeaddr_s *raddr,
                    uint16_t timeout);
 
diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c
index 98cc577f5f..d078a8534e 100644
--- a/net/sixlowpan/sixlowpan_send.c
+++ b/net/sixlowpan/sixlowpan_send.c
@@ -237,6 +237,7 @@ end_wait:
  *
  * Input Parameters:
  *   dev     - The IEEE802.15.4 MAC network driver interface.
+ *   list    - Head of callback list for send interrupt
  *   ipv6hdr - IPv6 header followed by TCP or UDP header.
  *   buf     - Data to send
  *   len     - Length of data to send
@@ -255,6 +256,7 @@ end_wait:
  ****************************************************************************/
 
 int sixlowpan_send(FAR struct net_driver_s *dev,
+                   FAR struct devif_callback_s **list,
                    FAR const struct ipv6_hdr_s *ipv6hdr, FAR const void *buf,
                    size_t len, FAR const struct rimeaddr_s *destmac,
                    uint16_t timeout)
@@ -283,7 +285,7 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
        * device related events, no connect-related events.
        */
 
-      sinfo.s_cb =  devif_callback_alloc(dev, NULL);
+      sinfo.s_cb =  devif_callback_alloc(dev, list);
       if (sinfo.s_cb != NULL)
         {
           int ret;
@@ -312,7 +314,7 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
 
           /* Make sure that no further interrupts are processed */
 
-           devif_dev_callback_free(dev, sinfo.s_cb);
+           devif_conn_callback_free(dev, sinfo.s_cb, list);
         }
     }
 
diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c
index 1ad8068a31..a34bfe0666 100644
--- a/net/sixlowpan/sixlowpan_tcpsend.c
+++ b/net/sixlowpan/sixlowpan_tcpsend.c
@@ -327,7 +327,8 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf,
   timeout = 0;
 #endif
 
-  ret = sixlowpan_send(dev, (FAR const struct ipv6_hdr_s *)&ipv6tcp,
+  ret = sixlowpan_send(dev, &conn->list,
+                       (FAR const struct ipv6_hdr_s *)&ipv6tcp,
                        buf, buflen, &destmac, timeout);
   if (ret < 0)
     {
diff --git a/net/sixlowpan/sixlowpan_udpsend.c b/net/sixlowpan/sixlowpan_udpsend.c
index 717df424a2..f8f62e528b 100644
--- a/net/sixlowpan/sixlowpan_udpsend.c
+++ b/net/sixlowpan/sixlowpan_udpsend.c
@@ -191,8 +191,9 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
 
   if (to6->sin6_family != AF_INET6 || tolen < sizeof(struct sockaddr_in6))
     {
-      nerr("ERROR: Invalid destination address\n");
-      return (ssize_t)-EAFNOSUPPORT;
+      nerr("ERROR: Invalid destination address: sin6_family=%u tolen = %u\n",
+           to6->sin6_family, tolen);
+      return (ssize_t)-EPROTOTYPE;
     }
 
   /* Get the underlying UDP "connection" structure */
@@ -200,14 +201,6 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
   conn = (FAR struct udp_conn_s *)psock->s_conn;
   DEBUGASSERT(conn != NULL);
 
-  /* Ignore if not IPv6 domain */
-
-  if (conn->domain != PF_INET6)
-    {
-      nwarn("WARNING: Not IPv6\n");
-      return (ssize_t)-EPROTOTYPE;
-    }
-
   /* Route outgoing message to the correct device */
 
 #ifdef CONFIG_NETDEV_MULTINIC
@@ -264,8 +257,8 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
 
   /* Copy the source and destination addresses */
 
-  net_ipv6addr_hdrcopy(ipv6udp.ipv6.srcipaddr,  to6->sin6_addr.in6_u.u6_addr16);
-  net_ipv6addr_hdrcopy(ipv6udp.ipv6.destipaddr, conn->u.ipv6.raddr);
+  net_ipv6addr_hdrcopy(ipv6udp.ipv6.destipaddr, to6->sin6_addr.in6_u.u6_addr16);
+  net_ipv6addr_hdrcopy(ipv6udp.ipv6.srcipaddr,  conn->u.ipv6.laddr);
 
   ninfo("IPv6 length: %d\n",
         ((int)ipv6udp.ipv6.len[0] << 8) + ipv6udp.ipv6.len[1]);
@@ -315,7 +308,8 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
   timeout = 0;
 #endif
 
-  ret = sixlowpan_send(dev, (FAR const struct ipv6_hdr_s *)&ipv6udp,
+  ret = sixlowpan_send(dev, &conn->list,
+                       (FAR const struct ipv6_hdr_s *)&ipv6udp,
                        buf, buflen, &destmac, timeout);
   if (ret < 0)
     {