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 cf7db5082150372ef33c71727b7ac58dcc7eec94..e4b4ed2c4f696e8767e2e7014de58a4828ebee3d 100644 (file)
--- 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 621fde32522b81ed36344124e24961ba02f34807..5abdf6e9a0e5071df78fa4e34315e518c7c0ec2c 100644 (file)
--- 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 {