From 14ac354dcaa1bc0fbc8e9484c6bf839931111bde Mon Sep 17 00:00:00 2001 From: xiangxistu Date: Thu, 31 Dec 2020 14:39:08 +0800 Subject: [PATCH] [update] when close auto check internet status, shield internet status information. Signed-off-by: xiangxistu --- components/net/netdev/src/netdev.c | 6 ++++-- components/net/sal_socket/src/sal_socket.c | 11 ----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index 92d5b188eb..76a937cc75 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -901,8 +901,8 @@ static void netdev_list_if(void) { rt_kprintf("%d", netdev->hwaddr[index]); } - - + + } } @@ -911,8 +911,10 @@ static void netdev_list_if(void) else rt_kprintf(" DOWN"); if (netdev->flags & NETDEV_FLAG_LINK_UP) rt_kprintf(" LINK_UP"); else rt_kprintf(" LINK_DOWN"); +#ifdef SAL_INTERNET_CHECK if (netdev->flags & NETDEV_FLAG_INTERNET_UP) rt_kprintf(" INTERNET_UP"); else rt_kprintf(" INTERNET_DOWN"); +#endif if (netdev->flags & NETDEV_FLAG_DHCP) rt_kprintf(" DHCP_ENABLE"); else rt_kprintf(" DHCP_DISABLE"); if (netdev->flags & NETDEV_FLAG_ETHARP) rt_kprintf(" ETHARP"); diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index fa94184f68..27dea260fb 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -299,17 +299,6 @@ int sal_check_netdev_internet_up(struct netdev *netdev) rt_delayed_work_init(net_work, check_netdev_internet_up_work, (void *)netdev); rt_work_submit(&(net_work->work), RT_TICK_PER_SECOND); -#else - if(netdev_is_link_up(netdev)) - { - netdev->flags |= NETDEV_FLAG_INTERNET_UP; - } - else - { - netdev->flags &= ~NETDEV_FLAG_INTERNET_UP; - } - LOG_D("You have shut down internet check function, internet status is subject to link status."); - #endif /* SAL_INTERNET_CHECK */ return 0; }