diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-02-28 14:54:37 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-02-28 14:54:37 -0800 |
| commit | e2d64c3ae308a10f6010c7cb162190b104604c7d (patch) | |
| tree | 0f0437ca4dff58d60e6f76470ad5eec96073a92d | |
| parent | 58624ecc3a79640bfde1f8c25acb1bd63cf08a54 (diff) | |
| parent | 6cd0b77e1e4f19d0ff916069b85f4bf191304933 (diff) | |
| download | android_external_wpa_supplicant_8-cm-11.0-XNPH22R-bacon-03d77315ea.tar.gz android_external_wpa_supplicant_8-cm-11.0-XNPH22R-bacon-03d77315ea.tar.bz2 android_external_wpa_supplicant_8-cm-11.0-XNPH22R-bacon-03d77315ea.zip | |
Merge remote-tracking branch 'github/cm-11.0' into HEADcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea
| -rw-r--r-- | hostapd/Android.mk | 4 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 94783317..07733575 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -44,6 +44,10 @@ ifeq ($(BOARD_WLAN_DEVICE), mrvl) L_CFLAGS += -DANDROID_P2P endif +ifeq ($(BOARD_WIFI_SKIP_CAPABILITIES), true) +L_CFLAGS += -DBOARD_WIFI_SKIP_CAPABILITIES +endif + # Use Android specific directory for control interface sockets L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\" ifdef USES_TI_MAC80211 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index a1b49575..c51792d4 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -6757,7 +6757,9 @@ static int wpa_driver_nl80211_sta_add(void *priv, params->listen_interval); NLA_PUT_U16(msg, NL80211_ATTR_STA_LISTEN_INTERVAL, params->listen_interval); - } else if (params->aid && (params->flags & WPA_STA_TDLS_PEER)) { + } +#ifndef BOARD_WIFI_SKIP_CAPABILITIES + else if (params->aid && (params->flags & WPA_STA_TDLS_PEER)) { wpa_printf(MSG_DEBUG, " * peer_aid=%u", params->aid); NLA_PUT_U16(msg, NL80211_ATTR_PEER_AID, params->aid); } @@ -6789,6 +6791,7 @@ static int wpa_driver_nl80211_sta_add(void *priv, params->ext_capab_len, params->ext_capab); } +#endif os_memset(&upd, 0, sizeof(upd)); upd.mask = sta_flags_nl80211(params->flags); upd.set = upd.mask; |