Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236207
b: refs/heads/master
c: 036dba1
h: refs/heads/master
i:
  236205: a42f3b9
  236203: 892d0b6
  236199: 9a271f6
  236191: d31b28d
v: v3
  • Loading branch information
Philip Worrall authored and Greg Kroah-Hartman committed Mar 2, 2011
1 parent b9fc09f commit 2ca254a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7404eab294f3275233ceaa592e029bf41601ab78
refs/heads/master: 036dba14d56fd3d43bab452625ec967c3f886fa4
14 changes: 5 additions & 9 deletions trunk/drivers/staging/vt6656/power.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,8 @@ void PSvDisablePowerSaving(void *hDeviceContext)
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
pDevice->bEnablePSMode = FALSE;

if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) {
if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)
PSbSendNullPacket(pDevice);
}

pDevice->bPWBitOn = FALSE;
return;
Expand Down Expand Up @@ -281,12 +280,11 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
PSTxMgmtPacket pTxPacket = NULL;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

if (pDevice->bLinkPass == FALSE) {
if (pDevice->bLinkPass == FALSE)
return FALSE;
}

if ((pDevice->bEnablePSMode == FALSE) &&
(pDevice->fTxDataInSleep == FALSE)){
(pDevice->fTxDataInSleep == FALSE)) {
return FALSE;
}

Expand All @@ -310,9 +308,8 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
));
}

if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
if(pMgmt->eCurrMode != WMAC_MODE_IBSS_STA)
pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_TODS(1));
}

memcpy(pTxPacket->p80211Header->sA3.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
Expand Down Expand Up @@ -347,9 +344,8 @@ BOOL PSbIsNextTBTTWakeUp(void *hDeviceContext)
BOOL bWakeUp = FALSE;

if (pMgmt->wListenInterval >= 2) {
if (pMgmt->wCountToWakeUp == 0) {
if (pMgmt->wCountToWakeUp == 0)
pMgmt->wCountToWakeUp = pMgmt->wListenInterval;
}

pMgmt->wCountToWakeUp --;

Expand Down

0 comments on commit 2ca254a

Please sign in to comment.