diff options
| author | chenyong <[email protected]> | 2019-05-10 15:57:58 +0800 |
|---|---|---|
| committer | chenyong <[email protected]> | 2019-05-10 15:57:58 +0800 |
| commit | 4de0533a5114fcc03f560d48868d13dab7553fba (patch) | |
| tree | 0c25511f42a736da514f16c05dda421773cf1276 /components/net/netdev | |
| parent | 9eef6441691772515523a025ac09b843121adfa0 (diff) | |
[net][sal][netdev] Delete the link_up status judgment in the send/recv interface
Signed-off-by: chenyong <[email protected]>
Diffstat (limited to 'components/net/netdev')
| -rw-r--r-- | components/net/netdev/include/netdev.h | 2 | ||||
| -rw-r--r-- | components/net/netdev/src/netdev.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/components/net/netdev/include/netdev.h b/components/net/netdev/include/netdev.h index 5ea8e96080..e9d8e38658 100644 --- a/components/net/netdev/include/netdev.h +++ b/components/net/netdev/include/netdev.h @@ -133,7 +133,7 @@ int netdev_register(struct netdev *netdev, const char *name, void *user_data); int netdev_unregister(struct netdev *netdev); /* Get network interface device object */ -struct netdev *netdev_get_first_link_up(void); +struct netdev *netdev_get_first_by_flags(uint16_t flags); struct netdev *netdev_get_by_ipaddr(ip_addr_t *ip_addr); struct netdev *netdev_get_by_name(const char *name); #ifdef RT_USING_SAL diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index fbc08325b4..71b1ec7ccd 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -134,12 +134,14 @@ int netdev_unregister(struct netdev *netdev) /** * This function will get the first network interface device - * with the link_up status in network interface device list. + * with the flags in network interface device list. + * + * @param flags the network interface device flags * * @return != NULL: network interface device object * NULL: get failed */ -struct netdev *netdev_get_first_link_up(void) +struct netdev *netdev_get_first_by_flags(uint16_t flags) { rt_base_t level; rt_slist_t *node = RT_NULL; @@ -155,7 +157,7 @@ struct netdev *netdev_get_first_link_up(void) for (node = &(netdev_list->list); node; node = rt_slist_next(node)) { netdev = rt_slist_entry(node, struct netdev, list); - if (netdev && netdev_is_up(netdev) && netdev_is_link_up(netdev)) + if (netdev && (netdev->flags & flags) != 0) { rt_hw_interrupt_enable(level); return netdev; @@ -679,7 +681,7 @@ static void netdev_auto_change_default(struct netdev *netdev) if (rt_memcmp(netdev, netdev_default, sizeof(struct netdev)) == 0) { - new_netdev = netdev_get_first_link_up(); + new_netdev = netdev_get_first_by_flags(NETDEV_FLAG_LINK_UP); if (new_netdev) { netdev_set_default(new_netdev); @@ -964,7 +966,7 @@ static int netdev_cmd_ping(char* target_name, rt_uint32_t times, rt_size_t size) else { /* using first internet up status network interface device */ - netdev = netdev_get_first_link_up(); + netdev = netdev_get_first_by_flags(NETDEV_FLAG_LINK_UP); if (netdev == RT_NULL || NETDEV_PING_IS_COMMONICABLE(netdev) == 0) { rt_kprintf("ping: network interface device get error.\n"); |
