diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-21 11:17:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-21 11:17:34 -0700 |
| commit | b33a811e81c126893dfadafca1fcbe5ae8564551 (patch) | |
| tree | cc51857a0e4a7e9acaeebed0a34e5df361eaa167 /wifi/wifi.c | |
| parent | 564c30323762685cdb811e2a985ad374a691745e (diff) | |
| parent | 44c99ec7cf4c78731d129d5657560dc555b24d50 (diff) | |
| download | hardware_libhardware_legacy-b33a811e81c126893dfadafca1fcbe5ae8564551.tar.gz hardware_libhardware_legacy-b33a811e81c126893dfadafca1fcbe5ae8564551.tar.bz2 hardware_libhardware_legacy-b33a811e81c126893dfadafca1fcbe5ae8564551.zip | |
am 44c99ec7: merge from froyo-plus-aosp
Merge commit '44c99ec7cf4c78731d129d5657560dc555b24d50'
* commit '44c99ec7cf4c78731d129d5657560dc555b24d50':
remove libnetutils dependency
Diffstat (limited to 'wifi/wifi.c')
| -rw-r--r-- | wifi/wifi.c | 27 |
1 files changed, 0 insertions, 27 deletions
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; |