apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-19 19:44:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminat a warning when both Ethernet and 6LoWPAN are enabled; improve some naming.

Browse Source
This commit is contained in:
Gregory Nutt
2017-07-02 11:28:12 -06:00
parent 9aa35b2799
commit d81d9c419b
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nshlib/nsh_netcmds.c
View File

@@ -1,7 +1,7 @@
/****************************************************************************
* apps/nshlib/nsh_netcmds.c
*
* Copyright (C) 2007-2012, 2014-2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2012, 2014-2015, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -758,10 +758,9 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
bool inet6 = false;
#endif
bool badarg = false;
#ifdef CONFIG_NET_ETHERNET
#if defined(CONFIG_NET_ETHERNET)
uint8_t mac[IFHWADDRLEN];
#endif
#ifdef CONFIG_NET_6LOWPAN
#elif defined(CONFIG_NET_6LOWPAN)
uint8_t eaddr[8];
#endif
#if defined(CONFIG_NSH_DHCPC)
@@ -769,11 +768,11 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
#endif
int ret;
/* With one or no arguments, ifconfig simply shows the status of Ethernet
* device:
/* With one or no arguments, ifconfig simply shows the status of the
* network device:
*
* ifconfig
* ifconfig [nic_name]
* ifconfig [interface]
*/
if (argc <= 2)