Speed up wlan availability if mac address file is missing - Reduce the timeout for loading to 5s, to match with the previous driver from Android - Use request_firmware_direct to load the MAC address file, it may not exist (e.g. DVT Dev Board hardware), and it's not going to magically appear, so don't waste a minute waiting on the userspace helper. Change-Id: If9dbffff8bfb2c84e6fd213303437baff07ec567
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index 3d3aae5..04af488 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -6422,7 +6422,7 @@ VOS_STATUS vos_status = VOS_STATUS_SUCCESS; memset(macTable, 0, sizeof(macTable)); - status = request_firmware(&fw, WLAN_MAC_FILE, pHddCtx->parent_dev); + status = request_firmware_direct(&fw, WLAN_MAC_FILE, pHddCtx->parent_dev); if (status) {
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index d0d590c..e77f387 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -17622,7 +17622,7 @@ /* accommodate the request firmware bin time out 2 min */ #define REQUEST_FWR_TIMEOUT 120000 -#define HDD_WLAN_START_WAIT_TIME (VOS_WDA_TIMEOUT + 5000 + REQUEST_FWR_TIMEOUT) +#define HDD_WLAN_START_WAIT_TIME 5000 /** * hdd_hif_register_driver() - API for HDD to register with HIF *