diff options
| author | Leslie Yu <leslie_yu@asus.com> | 2012-05-29 15:18:17 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-30 13:01:01 -0700 |
| commit | 3f427b101c92bf392850f45aeebf158b21455f71 (patch) | |
| tree | cdee7719ef45d03c02be65fdfde1c29a759e345a | |
| parent | 794eb6216d065da8cd4d1f0bb9258b293f822f40 (diff) | |
| download | kernel_samsung_tuna-3f427b101c92bf392850f45aeebf158b21455f71.zip kernel_samsung_tuna-3f427b101c92bf392850f45aeebf158b21455f71.tar.gz kernel_samsung_tuna-3f427b101c92bf392850f45aeebf158b21455f71.tar.bz2 | |
net: wireless: bcmdhd: Fix P2P driver crash for MFG firmware
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -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 870c903..5b2ad9c 100644 --- 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 |