diff options
| author | px4dev <px4@purgatory.org> | 2013-01-11 02:32:05 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-11 02:32:05 -0800 |
| commit | 0267782782f083c53bcf49b28e4ba2ed8c28105a (patch) | |
| tree | 07bae5bd37604b0af274163bd210a338bf408d54 /apps/nshlib/nsh_netinit.c | |
| parent | 919d53766acb1fa6acfb9e38074666167de772e9 (diff) | |
| download | px4-firmware-0267782782f083c53bcf49b28e4ba2ed8c28105a.tar.gz px4-firmware-0267782782f083c53bcf49b28e4ba2ed8c28105a.tar.bz2 px4-firmware-0267782782f083c53bcf49b28e4ba2ed8c28105a.zip | |
Recover changes lost to bad merging.
Diffstat (limited to 'apps/nshlib/nsh_netinit.c')
| -rw-r--r-- | apps/nshlib/nsh_netinit.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index c95bf4c40..58d238312 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/nshlib/nsh_netinit.c @@ -47,7 +47,7 @@ #include <net/if.h> #include <apps/netutils/uiplib.h> -#if defined(CONFIG_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS) # include <apps/netutils/resolv.h> # include <apps/netutils/dhcpc.h> #endif @@ -60,6 +60,10 @@ * Definitions ****************************************************************************/ +#if defined(CONFIG_NSH_DRIPADDR) && !defined(CONFIG_NSH_DNSIPADDR) +# define CONFIG_NSH_DNSIPADDR CONFIG_NSH_DRIPADDR +#endif + /**************************************************************************** * Private Types ****************************************************************************/ @@ -125,10 +129,14 @@ int nsh_netinit(void) addr.s_addr = HTONL(CONFIG_NSH_NETMASK); uip_setnetmask("eth0", &addr); -#if defined(CONFIG_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS) /* Set up the resolver */ resolv_init(); +#if defined(CONFIG_NSH_DNS) + addr.s_addr = HTONL(CONFIG_NSH_DNSIPADDR); + resolv_conf(&addr); +#endif #endif #if defined(CONFIG_NSH_DHCPC) |