merge from open-source master

Change-Id: Iff5f59c3bf645911730bfa7defee848e5b54a4a1

2 files changed, 0 insertions, 29 deletions

diff --git a/wifi/Android.mk b/wifi/Android.mk
index 5d94fb8..e181595 100644
--- a/wifi/Android.mk
+++ b/wifi/Android.mk
@@ -14,5 +14,3 @@ LOCAL_CFLAGS += -DWIFI_FIRMWARE_LOADER=\"$(WIFI_FIRMWARE_LOADER)\"
 endif
 
 LOCAL_SRC_FILES += wifi/wifi.c
-
-LOCAL_SHARED_LIBRARIES += libnetutils
diff --git a/wifi/wifi.c b/wifi/wifi.c
index 3f8708d..5fdf99b 100644
--- a/wifi/wifi.c
+++ b/wifi/wifi.c
@@ -36,11 +36,6 @@
 static struct wpa_ctrl *ctrl_conn;
 static struct wpa_ctrl *monitor_conn;
 
-extern int do_dhcp();
-extern int ifc_init();
-extern void ifc_close();
-extern char *dhcp_lasterror();
-extern void get_dhcp_info();
 extern int init_module(void *, unsigned long, const char *);
 extern int delete_module(const char *, unsigned int);
 
@@ -113,28 +108,6 @@ static int rmmod(const char *modname)
     return ret;
 }
 
-int do_dhcp_request(int *ipaddr, int *gateway, int *mask,
-                    int *dns1, int *dns2, int *server, int *lease) {
-    /* For test driver, always report success */
-    if (strcmp(iface, WIFI_TEST_INTERFACE) == 0)
-        return 0;
-
-    if (ifc_init() < 0)
-        return -1;
-
-    if (do_dhcp(iface) < 0) {
-        ifc_close();
-        return -1;
-    }
-    ifc_close();
-    get_dhcp_info(ipaddr, gateway, mask, dns1, dns2, server, lease);
-    return 0;
-}
-
-const char *get_dhcp_error_string() {
-    return dhcp_lasterror();
-}
-
 static int check_driver_loaded() {
     char driver_status[PROPERTY_VALUE_MAX];
     FILE *proc;