Wifi:bcmdhd: Fix for p2p NULL pointer. version 4.78.WFD.OOB.

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/rkversion.c
index 124cfb942961a28337681f0fc79f5d0ad6b30b83..4f61c0124ae248b7932ba4c7f38a5112ed2e60df 100644 (file)
--- 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 f725d5d695826470d774f8bc127539a4f314af85..836a196b6f297f2b6bc65aa93553b1ea2b3e335a 100644 (file)
--- 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"));