diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-10-24 10:24:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-10-24 10:24:54 -0700 |
| commit | 4c007050903cb66c66abba6ac60962f5bdc0876f (patch) | |
| tree | 0535e6f712b03219e12bec071c7b7bd5a5b66f7e | |
| parent | 5013f988c29b292b5ca66ad80deac79b0a6efa3c (diff) | |
| parent | a42f46ba337bdfcbc7455375fb468d115a625d7c (diff) | |
| download | android_external_wpa_supplicant_8-4c007050903cb66c66abba6ac60962f5bdc0876f.tar.gz android_external_wpa_supplicant_8-4c007050903cb66c66abba6ac60962f5bdc0876f.tar.bz2 android_external_wpa_supplicant_8-4c007050903cb66c66abba6ac60962f5bdc0876f.zip | |
Merge "P2P: Show p2p flag in debug info for scan results"
| -rw-r--r-- | wpa_supplicant/events.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 184b14ef..cd2bd1f5 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -688,10 +688,13 @@ static struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s, rsn_ie_len = ie ? ie[1] : 0; wpa_dbg(wpa_s, MSG_DEBUG, "%d: " MACSTR " ssid='%s' " - "wpa_ie_len=%u rsn_ie_len=%u caps=0x%x level=%d%s", + "wpa_ie_len=%u rsn_ie_len=%u caps=0x%x level=%d%s%s", i, MAC2STR(bss->bssid), wpa_ssid_txt(bss->ssid, bss->ssid_len), wpa_ie_len, rsn_ie_len, bss->caps, bss->level, - wpa_bss_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE) ? " wps" : ""); + wpa_bss_get_vendor_ie(bss, WPS_IE_VENDOR_TYPE) ? " wps" : "", + (wpa_bss_get_vendor_ie(bss, P2P_IE_VENDOR_TYPE) || + wpa_bss_get_vendor_ie_beacon(bss, P2P_IE_VENDOR_TYPE)) ? + " p2p" : ""); e = wpa_blacklist_get(wpa_s, bss->bssid); if (e) { |