diff --git a/arch b/arch
index 733010246bc..e42c14f7768 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 733010246bc55e28b8c99bc13798955a207c9860
+Subproject commit e42c14f77680579dbbfea48e257a8bda7079ddbf
diff --git a/net/local/local_connect.c b/net/local/local_connect.c
index f1176ad3c8d..1eab7220835 100644
--- a/net/local/local_connect.c
+++ b/net/local/local_connect.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/local/local_connnect.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -97,7 +97,7 @@ static inline void _local_semtake(sem_t *sem)
        * the wait was awakened by a signal.
        */
 
-      ASSERT(*get_errno_ptr() == EINTR);
+      DEBUGASSERT(get_errno() == EINTR);
     }
 }
 
diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c
index d54c3f6b059..c4a1a650d03 100644
--- a/net/netdev/netdev_ioctl.c
+++ b/net/netdev/netdev_ioctl.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/netdev/netdev_ioctl.c
  *
- *   Copyright (C) 2007-2012, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2012, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1083,26 +1083,28 @@ int netdev_ioctl(int sockfd, int cmd, unsigned long arg)
   /* Execute the command */
 
   ret = netdev_ifrioctl(psock, cmd, (FAR struct ifreq *)((uintptr_t)arg));
+
 #ifdef CONFIG_NET_IGMP
+  /* Check for address filtering commands */
+
   if (ret == -ENOTTY)
     {
-
       ret = netdev_imsfioctl(psock, cmd, (FAR struct ip_msfilter *)((uintptr_t)arg));
     }
 #endif
 
+#ifdef CONFIG_NET_ARP
   /* Check for ARP table IOCTL commands */
 
-#ifdef CONFIG_NET_ARP
   if (ret == -ENOTTY)
     {
       ret = netdev_arpioctl(psock, cmd, (FAR struct arpreq *)((uintptr_t)arg));
     }
 #endif
 
+#ifdef CONFIG_NET_ROUTE
   /* Check for Routing table IOCTL commands */
 
-#ifdef CONFIG_NET_ROUTE
   if (ret == -ENOTTY)
     {
       ret = netdev_rtioctl(psock, cmd, (FAR struct rtentry *)((uintptr_t)arg));
diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c
index c47eea2d110..52345043b43 100644
--- a/net/pkt/pkt_conn.c
+++ b/net/pkt/pkt_conn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/pkt/pkt_conn.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Large parts of this file were leveraged from uIP logic:
@@ -97,7 +97,7 @@ static inline void _pkt_semtake(sem_t *sem)
        * the wait was awakened by a signal.
        */
 
-      ASSERT(*get_errno_ptr() == EINTR);
+      DEBUGASSERT(get_errno() == EINTR);
     }
 }
 
diff --git a/net/socket/bind.c b/net/socket/bind.c
index fa39ed6f64c..8095c718077 100644
--- a/net/socket/bind.c
+++ b/net/socket/bind.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/socket/bind.c
  *
- *   Copyright (C) 2007-2009, 2012, 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2012, 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -316,7 +316,7 @@ int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
   return OK;
 
 errout:
-  *get_errno_ptr() = err;
+  set_errno(err);
   return ERROR;
 }
 
diff --git a/net/socket/net_sockets.c b/net/socket/net_sockets.c
index 4d2ae7dd621..31274117c73 100644
--- a/net/socket/net_sockets.c
+++ b/net/socket/net_sockets.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/socket/net_sockets.c
  *
- *   Copyright (C) 2007-2009, 2011-2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@ static void _net_semtake(FAR struct socketlist *list)
        * the wait was awakened by a signal.
        */
 
-      ASSERT(*get_errno_ptr() == EINTR);
+      DEBUGASSERT(get_errno() == EINTR);
     }
 }
 
diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c
index 7a0ce2e60c0..ddd599382e5 100644
--- a/net/udp/udp_conn.c
+++ b/net/udp/udp_conn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/udp/udp_conn.c
  *
- *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Large parts of this file were leveraged from uIP logic:
@@ -115,7 +115,7 @@ static inline void _udp_semtake(FAR sem_t *sem)
        * the wait was awakened by a signal.
        */
 
-      ASSERT(*get_errno_ptr() == EINTR);
+      ASSERT(get_errno() == EINTR);
     }
 }