diff options
Diffstat (limited to 'components/net/netdev/src')
| -rw-r--r-- | components/net/netdev/src/netdev.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index 09f6c37d9a..44eecea6b8 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -1013,7 +1013,7 @@ int netdev_dhcp_open(char* netdev_name) { rt_kprintf("bad network interface device name(%s).\n", netdev_name); return -1; - } + } netdev_dhcp_enabled(netdev,RT_TRUE); return 0; } @@ -1074,15 +1074,15 @@ int netdev_ifconfig(int argc, char **argv) { netdev_list_if(); } -#ifdef RT_LWIP_DHCP +#ifdef RT_LWIP_DHCP else if(argc == 3) { if (!strcmp(argv[2], "dhcp")) { - netdev_dhcp_open(argv[1]); + netdev_dhcp_open(argv[1]); } } -#endif +#endif else if (argc == 5) { rt_kprintf("config : %s\n", argv[1]); @@ -1094,9 +1094,9 @@ int netdev_ifconfig(int argc, char **argv) else { rt_kprintf("bad parameter! e.g: ifconfig e0 192.168.1.30 192.168.1.1 255.255.255.0\n"); -#ifdef RT_LWIP_DHCP +#ifdef RT_LWIP_DHCP rt_kprintf("bad parameter! e.g: ifconfig e0 dhcp\n"); -#endif +#endif } return 0; @@ -1130,19 +1130,15 @@ int netdev_cmd_ping(char* target_name, char *netdev_name, rt_uint32_t times, rt_ if (netdev_name != RT_NULL) { netdev = netdev_get_by_name(netdev_name); - if (netdev == RT_NULL) - { - netdev = netdev_default; - rt_kprintf("ping: not found specified netif, using default netdev %s.\n", netdev->name); - } } - if (NETDEV_PING_IS_COMMONICABLE(netdev_default)) + if (netdev == RT_NULL) { - /* using default network interface device for ping */ netdev = netdev_default; + rt_kprintf("ping: not found specified netif, using default netdev %s.\n", netdev->name); } - else + + if (!NETDEV_PING_IS_COMMONICABLE(netdev)) { /* using first internet up status network interface device */ netdev = netdev_get_first_by_flags(NETDEV_FLAG_LINK_UP); |