From 1221826c0f37a409c16a8bdef904556bb54357b9 Mon Sep 17 00:00:00 2001 From: gwl Date: Thu, 3 Apr 2014 09:24:34 +0800 Subject: [PATCH] Wifi:bcmdhd: Fix for p2p NULL pointer. version 4.78.WFD.OOB. --- drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c | 2 +- drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfgp2p.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c index 124cfb942961..4f61c0124ae2 100644 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c @@ -10,7 +10,7 @@ */ -const char RKWIFI_DRV_VERSION[] = "4.77.WFD.OOB"; +const char RKWIFI_DRV_VERSION[] = "4.78.WFD.OOB"; const char WIFI_MODULE_NAME[] = ""; const char CONFIG_BCMDHD_FW_PATH[] = ""; diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfgp2p.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfgp2p.c index f725d5d69582..836a196b6f29 100644 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfgp2p.c +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfgp2p.c @@ -2614,7 +2614,9 @@ wl_cfgp2p_stop_p2p_device(struct wiphy *wiphy, struct wireless_dev *wdev) goto exit; } - p2p_on(wl) = false; + // Fix for p2p NULL pointer (gwl) + if(wl->p2p) + p2p_on(wl) = false; CFGP2P_DBG(("P2P interface stopped\n")); -- 2.34.1