diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-02 20:06:30 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-02 20:06:30 -0700 |
| commit | be1ca8086b752565d0c0de6a6ead9ec454974fe9 (patch) | |
| tree | 3599f20ccc3240872ab24e6bd93c2d8ee32a9b8f | |
| parent | d00e77faedf730376b0ef1fbf13993c73eff146b (diff) | |
| parent | a1bc7444f734a3331463cffb517c8d4a36bc058d (diff) | |
| download | android_external_wpa_supplicant_8-be1ca8086b752565d0c0de6a6ead9ec454974fe9.tar.gz android_external_wpa_supplicant_8-be1ca8086b752565d0c0de6a6ead9ec454974fe9.tar.bz2 android_external_wpa_supplicant_8-be1ca8086b752565d0c0de6a6ead9ec454974fe9.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0b
| -rw-r--r-- | hostapd/Android.mk | 4 | ||||
| -rw-r--r-- | hostapd/ctrl_iface.c | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 07733575..bf2e2776 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -50,11 +50,7 @@ endif # Use Android specific directory for control interface sockets L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\" -ifdef USES_TI_MAC80211 -L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/wpa_supplicant\" -else L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/hostapd\" -endif # To force sizeof(enum) = 4 ifeq ($(TARGET_ARCH),arm) diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index 37d3fcdc..be941c44 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -14,10 +14,6 @@ #include <sys/stat.h> #include <stddef.h> -#ifdef USES_TI_MAC80211 -#include <cutils/sockets.h> -#endif /* USES_TI_MAC80211 */ - #include "utils/common.h" #include "utils/eloop.h" #include "common/version.h" @@ -1182,14 +1178,6 @@ int hostapd_ctrl_iface_init(struct hostapd_data *hapd) if (hapd->conf->ctrl_interface == NULL) return 0; -#ifdef USES_TI_MAC80211 - os_snprintf(addr.sun_path, sizeof(addr.sun_path), "wpa_%s", - hapd->conf->ctrl_interface); - s = android_get_control_socket(addr.sun_path); - if (s >= 0) - goto havesock; -#endif /* USES_TI_MAC80211 */ - if (mkdir(hapd->conf->ctrl_interface, S_IRWXU | S_IRWXG) < 0) { if (errno == EEXIST) { wpa_printf(MSG_DEBUG, "Using existing control " @@ -1300,10 +1288,6 @@ int hostapd_ctrl_iface_init(struct hostapd_data *hapd) } os_free(fname); -#ifdef USES_TI_MAC80211 -havesock: -#endif /* USES_TI_MAC80211 */ - hapd->ctrl_sock = s; eloop_register_read_sock(s, hostapd_ctrl_iface_receive, hapd, NULL); |