Cumulative patch from commit bab6677a3105f15b19b6be4a189e7baf61b4f791
bsb6677 Handle Wi-Fi Display commands more carefully if P2P is disabled
334ec00 Fix Beacon RX before AP setup completion
72e7fb3 nl80211: Fix regression in returning to AP mode after scan
Change-Id: I5d0a74f730d1ed757f8fe9b3402c295bbc3667e5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/wpa_supplicant/wifi_display.c b/wpa_supplicant/wifi_display.c
index 578199e..8435b63 100644
--- a/wpa_supplicant/wifi_display.c
+++ b/wpa_supplicant/wifi_display.c
@@ -41,6 +41,9 @@
struct wpabuf *ie, *buf;
size_t len, plen;
+ if (global->p2p == NULL)
+ return 0;
+
wpa_printf(MSG_DEBUG, "WFD: Update WFD IE");
if (!global->wifi_display) {