From: Jouni Malinen <j@w1.fi>
Date: Fri, 1 Nov 2013 13:44:47 +0000 (+0200)
Subject: AOSP: Merge mismatch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c89f86588d023bca989bfc42069579a925fd5298;p=thirdparty%2Fhostap.git

AOSP: Merge mismatch

This seems like undesired merge mismatch from this AOSP commit and
should be reverted:

commit f86232838cf712377867cb42417c1613ab5dc425
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed Feb 20 14:34:59 2013 -0800

    Accumulative patch from commit b618a469c42120e984ab1c85ed6058504d1fca78

      Author: Jouni Malinen <jouni@qca.qualcomm.com>
      Date:   Sat Feb 16 19:54:09 2013 +0200
        Interworking: Select highest priority cred if multiple matches

    Interworking: Select highest priority cred if multiple matches
    GAS server: Fix a regression in GAS server callback
    hostapd: Fix Max SP Length derivation from QoS Info
    nl80211: Configure STA Capabilities and Extended Capabilities
    Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
    WPS: Fix build without CONFIG_WPS_NFC
    WPS: Add support for NFC handover select generation with wpa_supplicant
    WPS: Update NFC connection handover documentation
    WPS: Add support for config token generation with wpa_supplicant
    WPS: Allow password token to be written with nfcpy
    WPS: Use pre-configured NFC password token instead of overriding it
    TDLS: Pass peer's Capability and Ext Capability info during sta_add
    TDLS: Pass peer's HT Capability and QOS information during sta_add
    nl80211: Add debug prints for STA add/set operations
    TDLS: Fix add/set STA operation
    Synchronize with wireless-testing.git include/uapi/linux/nl80211.h
    WPS: Allow Device Password to be changed from M1 to M2
    WPS: Fix wps_reg nfc-pw option
    TDLS: Tear down peers when disconnecting from the AP
    P2P: Do not use old scan result data for peer discovery
    Use more accurate timestamps for scan results
    P2P: Postpone P2P-DEVICE-FOUND if config_methods not known
    P2P: Do not allow peer update to clear config_methods
    WPS: Report NFC connection handover completion differently
    P2P: Avoid concurrent scans during all steps of group formation
    P2P: Cancel group formation timeout on group removal (on client)
    WPS: Change listen time to match nfcpy default (250 ms)
    WPS: Report only the carrier record from NFC to wpa_supplicant
    WPS: Fetch only the carrier record from wpa_supplicant for NFC
    WPS: Update nfcpy script to support AP mode NFC connection handover
    WPS: Add command for fetching carrier record for NFC handover
    WPS: Clean up debug prints with nfcpy
    WPS: Remove 0.5 sec extra wait from NFC handover with nfcpy
    WPS: Use alternating poll/listen for NFC peer discovery with nfcpy
    WPS: Configure logging to show nfcpy log message
    WPS: Add an example python script for NFC operations with hostapd
    hostapd: Do not change HT40 capability due to OBSS scan
    dbus: Add missing signal description for WPS (7)
    EAP peer: Add Session-Id derivation to more EAP methods
    EAP peer: Add Session-Id derivation
    EAP-IKEV2 server: Fix invalid memory freeing operation
    eap_proxy: Add a dummy implementation for compilation testing
    eap_proxy: Add mechanism for allowing EAP methods to be offloaded
    Android: Allow setgroups to be overridden from build configuration
    P2P: Send p2p_stop_find event on failure to start pending p2p_find
    P2P: Fix GO Probe Response IEs when Wi-Fi Display is enabled
    Capability matching for 60 GHz band
    nl80211: Add ctrl_iface message for AP mode connection rejection
    P2P: Allow local configuration to use 5 GHz band 40 MHz channels
    Fix BSS RANGE command for no exact id match cases

    Change-Id: Iac9284bba31db40911aecc3adf2843c9b1576db1
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 0fe666285..f22ae1181 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -499,6 +499,13 @@ CONFIG_EAP_SIM_COMMON=y
 NEED_AES_CBC=y
 endif
 
+ifdef CONFIG_EAP_PROXY
+L_CFLAGS += -DCONFIG_EAP_PROXY
+OBJS += src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).c
+include eap_proxy_$(CONFIG_EAP_PROXY).mk
+CONFIG_IEEE8021X_EAPOL=y
+endif
+
 ifdef CONFIG_EAP_AKA_PRIME
 # EAP-AKA'
 ifeq ($(CONFIG_EAP_AKA_PRIME), dyn)
@@ -1542,12 +1549,6 @@ ifneq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)
 LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB)
 endif
 LOCAL_SHARED_LIBRARIES := libc libcutils
-
-ifdef CONFIG_EAP_PROXY
-OBJS += src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).c
-include $(LOCAL_PATH)/eap_proxy_$(CONFIG_EAP_PROXY).mk
-endif
-
 ifeq ($(CONFIG_TLS), openssl)
 LOCAL_SHARED_LIBRARIES += libcrypto libssl libkeystore_binder
 endif