Merge pull request #3298 from xiangxistu/master

[net][lwip] fix assert in the sys_arch_mbox_fetch function when close socket

components/net/lwip-1.4.1/src/arch/sys_arch.c

@@ -498,14 +498,10 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
     }
 
     ret = rt_mb_recv(*mbox, (rt_ubase_t *)msg, t);
-    if(ret == -RT_ETIMEOUT)
+    if(ret != RT_EOK)
     {
         return SYS_ARCH_TIMEOUT;
     }
-    else
-    {
-        LWIP_ASSERT("rt_mb_recv returned with error!", ret == RT_EOK);
-    }
 
     /* get elapse msecond */
     tick = rt_tick_get() - tick;

components/net/lwip-2.0.2/src/arch/sys_arch.c

@@ -509,12 +509,9 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
     }
 
     ret = rt_mb_recv(*mbox, (rt_ubase_t *)msg, t);
-
-    if(ret == -RT_ETIMEOUT)
-        return SYS_ARCH_TIMEOUT;
-    else
+    if(ret != RT_EOK)
     {
-        LWIP_ASSERT("rt_mb_recv returned with error!", ret == RT_EOK);
+        return SYS_ARCH_TIMEOUT;
     }
 
     /* get elapse msecond */

components/net/lwip-2.1.0/src/arch/sys_arch.c

@@ -523,12 +523,9 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
     }
 
     ret = rt_mb_recv(*mbox, (rt_ubase_t *)msg, t);
-
-    if(ret == -RT_ETIMEOUT)
-        return SYS_ARCH_TIMEOUT;
-    else
+    if(ret != RT_EOK)
     {
-        LWIP_ASSERT("rt_mb_recv returned with error!", ret == RT_EOK);
+        return SYS_ARCH_TIMEOUT;
     }
 
     /* get elapse msecond */

components/net/lwip-2.1.0/src/netif/ethernetif.c

@@ -487,8 +487,13 @@ static err_t eth_netif_device_init(struct netif *netif)
 rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flags)
 {
     struct netif* netif;
-
+#if LWIP_NETIF_HOSTNAME
+#define LWIP_HOSTNAME_LEN 16
+    char *hostname = RT_NULL;
+    netif = (struct netif*) rt_malloc (sizeof(struct netif) + LWIP_HOSTNAME_LEN);
+#else
     netif = (struct netif*) rt_malloc (sizeof(struct netif));
+#endif
     if (netif == RT_NULL)
     {
         rt_kprintf("malloc netif failed\n");