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

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Leslie Yu 2012-05-29 15:18:17 -07:00 committed by Dmitry Shmidt
parent 794eb6216d
commit 3f427b101c

View File

@ -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