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/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 9538c51..6113db6 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -6905,6 +6905,7 @@
 	}
 
 	eloop_cancel_timeout(wpas_network_reenabled, wpa_s, NULL);
+	wpa_s->wnmsleep_used = 0;
 }