From 0267782782f083c53bcf49b28e4ba2ed8c28105a Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Fri, 11 Jan 2013 02:32:05 -0800
Subject: Recover changes lost to bad merging.

---
 apps/nshlib/nsh_netinit.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'apps/nshlib/nsh_netinit.c')

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)
-- 
cgit v1.2.3