summaryrefslogtreecommitdiff
path: root/wl1271/stad/src
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2010-09-01 14:44:40 -0700
committerDmitry Shmidt <dimitrysh@google.com>2010-09-01 14:44:40 -0700
commit566da93a1d2ebe1e0b7a556f61882b8b9dfe5c6d (patch)
treeedddae479c9b937ec9fe4f99c527d78f65bffab7 /wl1271/stad/src
parent652eb8d0d0417993ad841e70260e62360ab19c15 (diff)
downloadwlan-566da93a1d2ebe1e0b7a556f61882b8b9dfe5c6d.tar.gz
wl1271: Froyo patches from Moto
* Increase max beacon body length * Faster WiFi wakeup * Fix SDIO failure * WiFi data connectivity improvements * WiFi IOT improvements * WiFi stuck at high current drain Change-Id: I9d9b6bfd2f3ae319231d2bc1abf2eb3e9053d56b Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wl1271/stad/src')
-rw-r--r--wl1271/stad/src/Ctrl_Interface/DrvMain.c2
-rw-r--r--wl1271/stad/src/Data_link/TrafficMonitor.c2
-rw-r--r--wl1271/stad/src/Data_link/rx.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/wl1271/stad/src/Ctrl_Interface/DrvMain.c b/wl1271/stad/src/Ctrl_Interface/DrvMain.c
index 1838493d..3ce112de 100644
--- a/wl1271/stad/src/Ctrl_Interface/DrvMain.c
+++ b/wl1271/stad/src/Ctrl_Interface/DrvMain.c
@@ -1286,7 +1286,6 @@ TI_STATUS drvMain_Recovery (TI_HANDLE hDrvMain)
{
TDrvMain *pDrvMain = (TDrvMain *) hDrvMain;
- pDrvMain->uNumOfRecoveryAttempts++;
if (!pDrvMain->bRecovery)
{
TRACE1(pDrvMain->tStadHandles.hReport, REPORT_SEVERITY_CONSOLE,".....drvMain_Recovery, ts=%d\n", os_timeStampMs(pDrvMain->tStadHandles.hOs));
@@ -1731,6 +1730,7 @@ static void drvMain_Sm (TI_HANDLE hDrvMain, ESmEvent eEvent)
}
else if (pDrvMain->uNumOfRecoveryAttempts < MAX_NUM_OF_RECOVERY_TRIGGERS)
{
+ pDrvMain->uNumOfRecoveryAttempts++;
pDrvMain->eSmState = SM_STATE_STOPPING;
eStatus = drvMain_StopActivities (pDrvMain);
}
diff --git a/wl1271/stad/src/Data_link/TrafficMonitor.c b/wl1271/stad/src/Data_link/TrafficMonitor.c
index 501111cd..08f7f46c 100644
--- a/wl1271/stad/src/Data_link/TrafficMonitor.c
+++ b/wl1271/stad/src/Data_link/TrafficMonitor.c
@@ -1192,9 +1192,11 @@ static void TrafficMonitor_ChangeDownTimerStatus (TI_HANDLE hTrafficMonitor, TI_
{
pTrafficMonitor->DownTimerEnabled = TI_FALSE;
tmr_StopTimer (pTrafficMonitor->hTrafficMonTimer);
+ os_wake_unlock(pTrafficMonitor->hOs);
}
else if ((downEventsFound > 0) && (pTrafficMonitor->DownTimerEnabled == TI_FALSE))
{
+ os_wake_lock(pTrafficMonitor->hOs);
pTrafficMonitor->DownTimerEnabled = TI_TRUE;
/* Start the timer with user defined percentage of the the minimum interval discovered earlier */
tmr_StartTimer (pTrafficMonitor->hTrafficMonTimer,
diff --git a/wl1271/stad/src/Data_link/rx.c b/wl1271/stad/src/Data_link/rx.c
index 504387a3..c1979635 100644
--- a/wl1271/stad/src/Data_link/rx.c
+++ b/wl1271/stad/src/Data_link/rx.c
@@ -985,7 +985,7 @@ void rxData_receivePacketFromWlan (TI_HANDLE hRxData, void *pBuffer, TRxAttr* pR
}
default:
- TRACE0(pRxData->hReport, REPORT_SEVERITY_ERROR, " rxData_receivePacketFromWlan(): Received unspecified packet type !!! \n");
+ TRACE0(pRxData->hReport, REPORT_SEVERITY_INFORMATION, " rxData_receivePacketFromWlan(): Received unspecified packet type !!! \n");
RxBufFree(pRxData->hOs, pBuffer);
break;
}