From b8e8645e654ff8c991fd21eaa8afcafffbfa3201 Mon Sep 17 00:00:00 2001 From: Vipin Mehta Date: Fri, 17 Sep 2010 09:55:15 -0700 Subject: [PATCH] --- yaml --- r: 219909 b: refs/heads/master c: 9b906a33e0a459ea4d51c8d243154c6998be2a1d h: refs/heads/master i: 219907: 5965564ec2e1cd0c2ba80d4069dd32799298ab7f v: v3 --- [refs] | 2 +- trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3aa2e50912cb..2312265ec5ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 103281df0b7fec07872ef033666a1707b5755b9c +refs/heads/master: 9b906a33e0a459ea4d51c8d243154c6998be2a1d diff --git a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c index c7922c9ff233..daba6e4cb9d8 100644 --- a/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/trunk/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -4170,8 +4170,6 @@ ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap, A_UINT32 sw_ver, AR_SOFTC_T *ar = (AR_SOFTC_T *)devt; struct net_device *dev = ar->arNetDev; - ar->arWmiReady = TRUE; - wake_up(&arEvent); A_MEMCPY(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN); AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("mac address = %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", dev->dev_addr[0], dev->dev_addr[1], @@ -4182,6 +4180,10 @@ ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap, A_UINT32 sw_ver, ar->arVersion.wlan_ver = sw_ver; ar->arVersion.abi_ver = abi_ver; + /* Indicate to the waiting thread that the ready event was received */ + ar->arWmiReady = TRUE; + wake_up(&arEvent); + #if WLAN_CONFIG_IGNORE_POWER_SAVE_FAIL_EVENT_DURING_SCAN wmi_pmparams_cmd(ar->arWmi, 0, 1, 0, 0, 1, IGNORE_POWER_SAVE_FAIL_EVENT_DURING_SCAN); #endif