summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-17 11:26:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-17 11:26:02 -0600
commit780c100a1c2d4d0f5bd62089121ff75d5a024e86 (patch)
treec46732d0986625f650471be4b63eb8f844f818e3 /apps
parent4c9a83268147226e0aaa8c12012c856b69eaefbc (diff)
downloadnuttx-780c100a1c2d4d0f5bd62089121ff75d5a024e86.tar.gz
nuttx-780c100a1c2d4d0f5bd62089121ff75d5a024e86.tar.bz2
nuttx-780c100a1c2d4d0f5bd62089121ff75d5a024e86.zip
Minor corrections during integration of link status monitor
Diffstat (limited to 'apps')
-rw-r--r--apps/nshlib/Kconfig2
-rw-r--r--apps/nshlib/nsh.h3
-rw-r--r--apps/nshlib/nsh_netinit.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index cae3a7dca..7bf8f32fa 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -813,7 +813,7 @@ if NSH_NETINIT_THREAD
config NSH_NETINIT_MONITOR
bool "Monitor link state"
default n
- depends on ARCH_PHY_INTERRUPT && NET_UDP && !DISABLE_SIGNALS && EXPERIMENTAL
+ depends on ARCH_PHY_INTERRUPT && NETDEV_PHY_IOCTL && NET_UDP && !DISABLE_SIGNALS && EXPERIMENTAL
---help---
By default the net initialization thread will bring-up the network
then exit, freeing all of the resources that it required. This is a
diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h
index 625d10b35..23b030072 100644
--- a/apps/nshlib/nsh.h
+++ b/apps/nshlib/nsh.h
@@ -133,7 +133,8 @@
#endif
#if !defined(CONFIG_NSH_NETINIT_THREAD) || !defined(CONFIG_ARCH_PHY_INTERRUPT) || \
- !defined(CONFIG_NET_UDP) || defined(CONFIG_DISABLE_SIGNALS)
+ !defined(CONFIG_NETDEV_PHY_IOCTL) || !defined(CONFIG_NET_UDP) || \
+ defined(CONFIG_DISABLE_SIGNALS)
# undef CONFIG_NSH_NETINIT_MONITOR
#endif
diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c
index e04591f7b..d0df779b8 100644
--- a/apps/nshlib/nsh_netinit.c
+++ b/apps/nshlib/nsh_netinit.c
@@ -378,7 +378,7 @@ static int nsh_netinit_monitor(void)
}
nvdbg("%s: devup=%d PHY address=%02x MSR=%04x\n",
- devup, ifr.ifr_name, ifr.ifr_mii_phy_id, ifr.ifr_mii_val_out);
+ ifr.ifr_name, devup, ifr.ifr_mii_phy_id, ifr.ifr_mii_val_out);
/* Check for link up or down */