[external/wpa_supplicant_8] Merge tag 'android-5.1.1_r13' into HEAD

Android 5.1.1 release 13
This commit is contained in:
Firefly
2015-09-15 23:40:58 +08:00
committed by djw
parent 7ea39af708
commit 01ce26882f

View File

@ -736,6 +736,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
os_memcpy(dev->interface_addr, addr, ETH_ALEN);
if (msg.ssid &&
msg.ssid[1] <= sizeof(dev->oper_ssid) &&
(msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
!= 0)) {