github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-10 07:32:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: wireless: bcmdhd: Decrease chip recognition attempts to 3

Browse Source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt 2012-06-26 17:17:02 -07:00
parent b2740a41fe
commit feae537a1a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/bcmdhd/dhd.h
View File

@ -93,10 +93,10 @@ enum dhd_bus_state {
#define DHD_SCAN_PASSIVE_TIME 130 /* ms: Embedded default Passive setting from DHD Driver */
#ifndef POWERUP_MAX_RETRY
#define POWERUP_MAX_RETRY (10) /* how many times we retry to power up the chip */
#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 2000 /* ms: time out in waiting wifi to come up */
#endif
enum dhd_bus_wake_state {

8
drivers/net/wireless/bcmdhd/dhd_linux.c
View File

@ -2459,7 +2459,7 @@ dhd_open(struct net_device *net)
firmware_path[0] = '\0';
}
dhd->pub.dongle_trap_occured = 0;
dhd->pub.dongle_trap_occured = 0;
dhd->pub.hang_was_sent = 0;
#if !defined(WL_CFG80211)
/*
@ -3894,8 +3894,8 @@ void dhd_detach(dhd_pub_t *dhdp)
if (dhd->dhd_state & DHD_ATTACH_STATE_WAKELOCKS_INIT) {
#ifdef CONFIG_HAS_WAKELOCK
dhd->wakelock_counter = 0;
dhd->wakelock_rx_timeout_enable = 0;
dhd->wakelock_ctrl_timeout_enable = 0;
dhd->wakelock_rx_timeout_enable = 0;
dhd->wakelock_ctrl_timeout_enable = 0;
wake_lock_destroy(&dhd->wl_wifi);
wake_lock_destroy(&dhd->wl_rxwake);
wake_lock_destroy(&dhd->wl_ctrlwake);
@ -3998,7 +3998,7 @@ dhd_module_init(void)
break;
}
DHD_ERROR(("\nfailed to power up wifi chip, retry again (%d left) **\n\n",
retry+1));
retry));
dhd_bus_unreg_sdio_notify();
#if defined(CONFIG_WIFI_CONTROL_FUNC)
wl_android_wifictrl_func_del();

2
drivers/net/wireless/bcmdhd/wl_android.c
View File

@ -391,7 +391,7 @@ int wl_android_wifi_on(struct net_device *dev)
if (ret == 0)
break;
DHD_ERROR(("\nfailed to power up wifi chip, retry again (%d left) **\n\n",
retry+1));
retry));
dhd_customer_gpio_wlan_ctrl(WLAN_RESET_OFF);
} while (retry-- >= 0);
if (ret != 0) {