From: gwl <gwl@rock-chips.com>
Date: Wed, 5 Mar 2014 02:08:56 +0000 (+0800)
Subject: wifi: extend power up waiting time.
X-Git-Tag: firefly_0821_release~6208
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b68e5c6ffb7277e7f227db71bd7262c77f8577b1;p=firefly-linux-kernel-4.4.55.git

wifi: extend power up waiting time.
---

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
index cf7db5082150..e4b4ed2c4f69 100644
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
@@ -53,7 +53,7 @@ ifneq ($(CONFIG_WIRELESS_EXT),)
 $(MODULE_NAME)-y += wl_iw.o
 DHDCFLAGS += -DSOFTAP -DWL_WIRELESS_EXT -DUSE_IW
 endif
-ifneq ($(CONFIG_CFG80211),)
+ifeq ($(CONFIG_CFG80211),y)
 $(MODULE_NAME)-y += wl_cfg80211.o wl_cfgp2p.o wl_linux_mon.o dhd_cfg80211.o
 DHDCFLAGS += -DWL_CFG80211 -DWLP2P -DWL_CFG80211_STA_EVENT 
 DHDCFLAGS += -DCUSTOM_ROAM_TRIGGER_SETTING=-65
diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd.h b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd.h
index 621fde32522b..5abdf6e9a0e5 100644
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd.h
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd.h
@@ -109,7 +109,7 @@ enum dhd_op_flags {
 #define POWERUP_MAX_RETRY	3 /* how many times we retry to power up the chip */
 #endif
 #ifndef POWERUP_WAIT_MS
-#define POWERUP_WAIT_MS		2000 /* ms: time out in waiting wifi to come up */
+#define POWERUP_WAIT_MS		5000 /* ms: time out in waiting wifi to come up */
 #endif
 
 enum dhd_bus_wake_state {