net: wireless: bcmdhd: Fix P2P driver crash for MFG firmware

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 870c9039de3f1d33b68ea342a83ed954a744cfcc..5b2ad9c9137758ab6ea888110dea863e4c998db4 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -4565,7 +4565,7 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
                return -EINVAL;
        }
 
-       WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM"
+       WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM "
                        "mgmt_type %d frame_len %d\n", bi->SSID,
                        notif_bss_info->rssi, notif_bss_info->channel,
                        mgmt->u.beacon.capab_info, &bi->BSSID, mgmt_type,
@@ -4574,7 +4574,7 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi)
        signal = notif_bss_info->rssi * 100;
 
 #if defined(WLP2P) && defined(WL_ENABLE_P2P_IF)
-       if (wl->p2p_net && wl->scan_request &&
+       if (wl->p2p && wl->p2p_net && wl->scan_request &&
                ((wl->scan_request->dev == wl->p2p_net) ||
                (wl->scan_request->dev == wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION)))){
 #else