jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Android: Use extended P2P functionality (ANDROID_P2P) for all vendors

Browse source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt 2014-04-11 16:05:39 -07:00 committed by Jouni Malinen
parent 9a41232165
commit 959214b260
3 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hostapd/Android.mk
View file

@ -27,16 +27,10 @@ L_CFLAGS += -DANDROID_LOG_NAME=\"hostapd\"
# Disable unused parameter warnings # Disable unused parameter warnings
L_CFLAGS += -Wno-unused-parameter L_CFLAGS += -Wno-unused-parameter
ifeq ($(BOARD_WLAN_DEVICE), bcmdhd) # Set Android extended P2P functionality
L_CFLAGS += -DANDROID_P2P
endif
ifeq ($(BOARD_WLAN_DEVICE), qcwcn)
L_CFLAGS += -DANDROID_P2P
endif
ifeq ($(BOARD_WLAN_DEVICE), mrvl)
L_CFLAGS += -DANDROID_P2P L_CFLAGS += -DANDROID_P2P
ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),)
L_CFLAGS += -DANDROID_P2P_STUB
endif endif
# Use Android specific directory for control interface sockets # Use Android specific directory for control interface sockets

17
src/drivers/driver_nl80211.c
View file

@ -372,12 +372,29 @@ extern int wpa_driver_nl80211_driver_cmd(void *priv, char *cmd, char *buf,
size_t buf_len); size_t buf_len);
#endif /* ANDROID */ #endif /* ANDROID */
#ifdef ANDROID_P2P #ifdef ANDROID_P2P
#ifdef ANDROID_P2P_STUB
int wpa_driver_set_p2p_noa(void *priv, u8 count, int start, int duration) {
return 0;
}
int wpa_driver_get_p2p_noa(void *priv, u8 *buf, size_t len) {
return 0;
}
int wpa_driver_set_p2p_ps(void *priv, int legacy_ps, int opp_ps, int ctwindow) {
return -1;
}
int wpa_driver_set_ap_wps_p2p_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *proberesp,
const struct wpabuf *assocresp) {
return 0;
}
#else /* ANDROID_P2P_STUB */
int wpa_driver_set_p2p_noa(void *priv, u8 count, int start, int duration); int wpa_driver_set_p2p_noa(void *priv, u8 count, int start, int duration);
int wpa_driver_get_p2p_noa(void *priv, u8 *buf, size_t len); int wpa_driver_get_p2p_noa(void *priv, u8 *buf, size_t len);
int wpa_driver_set_p2p_ps(void *priv, int legacy_ps, int opp_ps, int ctwindow); int wpa_driver_set_p2p_ps(void *priv, int legacy_ps, int opp_ps, int ctwindow);
int wpa_driver_set_ap_wps_p2p_ie(void *priv, const struct wpabuf *beacon, int wpa_driver_set_ap_wps_p2p_ie(void *priv, const struct wpabuf *beacon,
const struct wpabuf *proberesp, const struct wpabuf *proberesp,
const struct wpabuf *assocresp); const struct wpabuf *assocresp);
#endif /* ANDROID_P2P_STUB */
#endif /* ANDROID_P2P */ #endif /* ANDROID_P2P */
static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx); static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx);

15
wpa_supplicant/Android.mk
View file

@ -27,24 +27,21 @@ L_CFLAGS += -DANDROID_LOG_NAME=\"wpa_supplicant\"
# Disable unused parameter warnings # Disable unused parameter warnings
L_CFLAGS += -Wno-unused-parameter L_CFLAGS += -Wno-unused-parameter
# Set Android extended P2P functionality
L_CFLAGS += -DANDROID_P2P
ifeq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)
L_CFLAGS += -DANDROID_P2P_STUB
endif
# Disable roaming in wpa_supplicant # Disable roaming in wpa_supplicant
ifdef CONFIG_NO_ROAMING ifdef CONFIG_NO_ROAMING
L_CFLAGS += -DCONFIG_NO_ROAMING L_CFLAGS += -DCONFIG_NO_ROAMING
endif endif
ifeq ($(BOARD_WLAN_DEVICE), bcmdhd) ifeq ($(BOARD_WLAN_DEVICE), bcmdhd)
L_CFLAGS += -DANDROID_P2P
L_CFLAGS += -DP2P_CONCURRENT_SEARCH_DELAY=0 L_CFLAGS += -DP2P_CONCURRENT_SEARCH_DELAY=0
endif endif
ifeq ($(BOARD_WLAN_DEVICE), qcwcn)
L_CFLAGS += -DANDROID_P2P
endif
ifeq ($(BOARD_WLAN_DEVICE), mrvl)
L_CFLAGS += -DANDROID_P2P
endif
# Use Android specific directory for control interface sockets # Use Android specific directory for control interface sockets
L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\" L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\"
L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/wpa_supplicant\" L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/wpa_supplicant\"