diff options
| author | Emerson Pinter <dev@pinter.com.br> | 2013-01-17 19:20:14 -0200 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-11-11 01:42:17 -0800 |
| commit | b57f609093ec3c6cb66b4c8df216e84273b39382 (patch) | |
| tree | e3935128542ca187ac85cf0dbd19e995d3a1d86c | |
| parent | 937d4258bc7564ec3f5607750627d45f265f6ebe (diff) | |
| download | android_external_wpa_supplicant_8-b57f609093ec3c6cb66b4c8df216e84273b39382.tar.gz android_external_wpa_supplicant_8-b57f609093ec3c6cb66b4c8df216e84273b39382.tar.bz2 android_external_wpa_supplicant_8-b57f609093ec3c6cb66b4c8df216e84273b39382.zip | |
nl80211: add ifndef on AP SME condition
The condition causes problems on driver initialization if the
NL80211_ATTR_DEVICE_AP_SME is not available. Needs
BOARD_NO_APSME_ATTR:=true.
Change-Id: I88e91996d8e6a70f46a5a84d6540bf3d3b628ddd
| -rw-r--r-- | hostapd/Android.mk | 4 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211.c | 2 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 81457ac9..c40b8a90 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -32,6 +32,10 @@ ifeq ($(BOARD_LEGACY_NL80211_STA_EVENTS),true) L_CFLAGS += -DLEGACY_STA_EVENTS endif +ifeq ($(BOARD_NO_APSME_ATTR),true) +L_CFLAGS += -DNO_APSME_ATTR +endif + ifeq ($(BOARD_WLAN_DEVICE), qcwcn) L_CFLAGS += -DANDROID_P2P endif diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 08fbeee5..79f0292d 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -3244,7 +3244,9 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg) wiphy_info_tdls(capa, tb[NL80211_ATTR_TDLS_SUPPORT], tb[NL80211_ATTR_TDLS_EXTERNAL_SETUP]); +#ifndef NO_APSME_ATTR if (tb[NL80211_ATTR_DEVICE_AP_SME]) +#endif info->device_ap_sme = 1; wiphy_info_feature_flags(info, tb[NL80211_ATTR_FEATURE_FLAGS]); diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index a8bd89e6..ea81ab25 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -34,6 +34,10 @@ L_CFLAGS += -DANDROID_P2P L_CFLAGS += -DP2P_CONCURRENT_SEARCH_DELAY=0 endif +ifeq ($(BOARD_NO_APSME_ATTR),true) +L_CFLAGS += -DNO_APSME_ATTR +endif + ifeq ($(BOARD_WLAN_DEVICE), qcwcn) L_CFLAGS += -DANDROID_P2P endif |