OSDN Git Service

Accumulative patch from commit f8361e3d681e55efead2aac79fedf4b232d533fb
authorDmitry Shmidt <dimitrysh@google.com>
Wed, 27 Feb 2013 20:56:00 +0000 (12:56 -0800)
committerDmitry Shmidt <dimitrysh@google.com>
Wed, 27 Feb 2013 20:56:00 +0000 (12:56 -0800)
commit33e38bfa7159cef089d6ee0d904778e184c72c47
tree4258fe27ce012de28d596a92d54ec097ced2b4f7
parent33077b18208aab987e14cd26f0f501c7666a89ff
Accumulative patch from commit f8361e3d681e55efead2aac79fedf4b232d533fb

TDLS: Pass peer's VHT Capability information during sta_add
WPS: Clear sent_carrier to avoid errors in python script
WPS: Fix OOB Device Password use in PSK1,PSK1 derivation
WPS: Add AP mode NFC connection handover with wpa_supplicant/nfcpy
WPS NFC: Add connection handover support for ER
WPS: Add wps-er-config command for writing config token from ER

Change-Id: I8934dcffb9f66bd3a2f840b78d72c9dd6cecf61d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
14 files changed:
hostapd/wps-ap-nfc.py
src/ap/wps_hostapd.c
src/eap_peer/eap_wsc.c
src/rsn_supp/tdls.c
src/rsn_supp/wpa.h
src/rsn_supp/wpa_i.h
src/rsn_supp/wpa_ie.c
src/rsn_supp/wpa_ie.h
src/wps/wps_registrar.c
wpa_supplicant/ctrl_iface.c
wpa_supplicant/examples/wps-nfc.py
wpa_supplicant/wpas_glue.c
wpa_supplicant/wps_supplicant.c
wpa_supplicant/wps_supplicant.h