Cumulative patch from commit 07e3653922513f4309528e299b9ee569c0fe1d28
07e3653 dbus: Do not use pointer arithmetic with a void pointer
3b49719 Android: Use libdbus rather than dbus-1
5b75ece Document passive_scan option for wpa_supplicant.conf
68ac584 nl80211: Add debug message for passive scanning
2d0fe6b dbus: Add SaveConfig to update configuration file
a3dff7d P2P: Fix a typo in debug message
fb7e7da dbus: Fix a copy-paste error in debug print
9557788 EAP-pwd peer: Fix error path for unexpected Confirm message
bef802e EAP-pwd server: Fix last fragment length validation
8057821 EAP-pwd peer: Fix last fragment length validation
03ed0a52 WNM: Ignore WNM-Sleep Mode Response if WNM-Sleep Mode has not been used
2cb28a4 WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use
Change-Id: Iaa3ec4905772219f13837a8c2e367fc0b3d862f2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c
index 966c3fb..dd1993c 100644
--- a/src/drivers/driver_nl80211_scan.c
+++ b/src/drivers/driver_nl80211_scan.c
@@ -132,6 +132,8 @@
goto fail;
}
nla_nest_end(msg, ssids);
+ } else {
+ wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested");
}
if (params->extra_ies) {
diff --git a/src/p2p/p2p_invitation.c b/src/p2p/p2p_invitation.c
index 108e5b7..70da15a 100644
--- a/src/p2p/p2p_invitation.c
+++ b/src/p2p/p2p_invitation.c
@@ -284,7 +284,7 @@
if (!p2p_channels_includes(&intersection, reg_class, channel))
{
- p2p_dbg(p2p, "forced freq %d MHz not in the supported channels interaction",
+ p2p_dbg(p2p, "forced freq %d MHz not in the supported channels intersection",
op_freq);
status = P2P_SC_FAIL_NO_COMMON_CHANNELS;
goto fail;