diff options
| author | Howard M. Harte <hharte@broadcom.com> | 2011-07-25 19:15:11 -0700 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-10-28 11:00:00 +0200 |
| commit | 9507fa86cdb8ed22dee4067dcbaf600e6f60cdf0 (patch) | |
| tree | 1147f0810ba79ca3ce699548b45477c3116e9679 /drivers/net/wireless/bcmdhd/wl_android.c | |
| parent | 6d6fb2996b129a247304229b9cbbcdb908680595 (diff) | |
Update to 5.90.125.52:
Fix unremoved monitor interface problem after killing hostapd.
Add WPS support for hostapd.
Change-Id: I4e476fafb203592fcdf5c15a526b67d4aa78df3e
Signed-off-by: Howard M. Harte <hharte@broadcom.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35556
Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/wl_android.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_android.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c index 876fc080ac1..8314bbc5f44 100644 --- a/drivers/net/wireless/bcmdhd/wl_android.c +++ b/drivers/net/wireless/bcmdhd/wl_android.c @@ -92,7 +92,7 @@ typedef struct cmd_tlv { char subver; char reserved; } cmd_tlv_t; -#endif +#endif /* PNO_SUPPORT */ typedef struct android_wifi_priv_cmd { char *buf; @@ -280,7 +280,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t exit_proc: return res; } -#endif +#endif /* PNO_SUPPORT */ static int wl_android_get_p2p_dev_addr(struct net_device *ndev, char *command, int total_len) { @@ -401,7 +401,7 @@ int wl_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) if (!g_wifi_on) { DHD_ERROR(("%s: Ignore private cmd \"%s\" - iface %s is down\n", - __FUNCTION__, command, ifr->ifr_name)); + __FUNCTION__, command, ifr->ifr_name)); ret = 0; goto exit; } @@ -520,6 +520,17 @@ int wl_android_exit(void) return ret; } +int wl_android_post_init(void) +{ + int ret = 0; + if (!dhd_download_fw_on_driverload) { + /* Call customer gpio to turn off power with WL_REG_ON signal */ + dhd_customer_gpio_wlan_ctrl(WLAN_RESET_OFF); + g_wifi_on = 0; + + } + return ret; +} /** * Functions for Android WiFi card detection |