diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-21 08:05:41 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-21 08:05:41 -0600 |
| commit | 7c1ee71aec26e9a9a6158e393ad6ac5e4f08c363 (patch) | |
| tree | f0544a25e1f77c31d63fb09159be1a1f769fead1 /apps | |
| parent | f3a142353c0ac2c61aa86920cf7f9fa98b22796d (diff) | |
| parent | a664117feae95bcabd973482489ce717bd413866 (diff) | |
| download | nuttx-7c1ee71aec26e9a9a6158e393ad6ac5e4f08c363.tar.gz nuttx-7c1ee71aec26e9a9a6158e393ad6ac5e4f08c363.tar.bz2 nuttx-7c1ee71aec26e9a9a6158e393ad6ac5e4f08c363.zip | |
Merge remote-tracking branch 'origin/master' into ipv6
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/examples/nettest/nettest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c index 59a56abf6..c42f688c6 100644 --- a/apps/examples/nettest/nettest.c +++ b/apps/examples/nettest/nettest.c @@ -118,7 +118,7 @@ int main(int argc, FAR char *argv[]) int nettest_main(int argc, char *argv[]) #endif { -#ifdef CONFIG_EXAMPLES_NETTEST_IPv4 +#ifndef CONFIG_EXAMPLES_NETTEST_IPv6 struct in_addr addr; #endif #ifdef CONFIG_EXAMPLES_NETTEST_NOMAC @@ -134,7 +134,7 @@ int nettest_main(int argc, char *argv[]) mac[3] = 0xad; mac[4] = 0xbe; mac[5] = 0xef; - netlib_setmacaddr(EXAMPLES_NETTEST_IPv6NETMASK_, mac); + netlib_setmacaddr("eth0", mac); #endif #ifdef CONFIG_EXAMPLES_NETTEST_IPv6 @@ -156,17 +156,17 @@ int nettest_main(int argc, char *argv[]) /* Set up our host address */ addr.s_addr = HTONL(CONFIG_EXAMPLES_NETTEST_IPADDR); - netlib_set_ipv4addr(EXAMPLES_NETTEST_IPv6NETMASK_, &addr); + netlib_set_ipv4addr("eth0", &addr); /* Set up the default router address */ addr.s_addr = HTONL(CONFIG_EXAMPLES_NETTEST_DRIPADDR); - netlib_set_dripv4addr(EXAMPLES_NETTEST_IPv6NETMASK_, &addr); + netlib_set_dripv4addr("eth0", &addr); /* Setup the subnet mask */ addr.s_addr = HTONL(CONFIG_EXAMPLES_NETTEST_NETMASK); - netlib_set_ipv4netmask(EXAMPLES_NETTEST_IPv6NETMASK_, &addr); + netlib_set_ipv4netmask("eth0", &addr); #endif #ifdef CONFIG_EXAMPLES_NETTEST_SERVER |