diff options
| author | Leslie Yu <leslie_yu@asus.com> | 2012-05-29 15:18:17 -0700 |
|---|---|---|
| committer | Om Prakash Singh <omp@nvidia.com> | 2012-06-15 14:15:18 +0530 |
| commit | a5369a7586398d5071d4313e3bc068d8a0fd51cf (patch) | |
| tree | 19f658e74b033f3c924dc9ed7bcbd1d1d150fa65 /drivers/net | |
| parent | dd9038724e7b36d9fb38905e279c1370e2e45fec (diff) | |
net: wireless: bcmdhd: Fix P2P driver crash for MFG firmware
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 272c0322c5ec..fa3766699a86 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -4568,7 +4568,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, @@ -4577,7 +4577,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 |