Commit 036dba14 authored by Philip Worrall's avatar Philip Worrall Committed by Greg Kroah-Hartman

Staging: vt6656: Clean up unneccessary braces in power.c

Clean up some unnecessary braces for conditional statements
where a single statement will do.
Signed-off-by: default avatarPhilip Worrall <philip.worrall@googlemail.com>
Reviewed-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7404eab2
...@@ -159,9 +159,8 @@ void PSvDisablePowerSaving(void *hDeviceContext) ...@@ -159,9 +159,8 @@ void PSvDisablePowerSaving(void *hDeviceContext)
MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN); MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);
pDevice->bEnablePSMode = FALSE; pDevice->bEnablePSMode = FALSE;
if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) { if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)
PSbSendNullPacket(pDevice); PSbSendNullPacket(pDevice);
}
pDevice->bPWBitOn = FALSE; pDevice->bPWBitOn = FALSE;
return; return;
...@@ -281,12 +280,11 @@ BOOL PSbSendNullPacket(void *hDeviceContext) ...@@ -281,12 +280,11 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
PSTxMgmtPacket pTxPacket = NULL; PSTxMgmtPacket pTxPacket = NULL;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
if (pDevice->bLinkPass == FALSE) { if (pDevice->bLinkPass == FALSE)
return FALSE; return FALSE;
}
if ((pDevice->bEnablePSMode == FALSE) && if ((pDevice->bEnablePSMode == FALSE) &&
(pDevice->fTxDataInSleep == FALSE)){ (pDevice->fTxDataInSleep == FALSE)) {
return FALSE; return FALSE;
} }
...@@ -310,9 +308,8 @@ BOOL PSbSendNullPacket(void *hDeviceContext) ...@@ -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)); 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.abyAddr1, pMgmt->abyCurrBSSID, WLAN_ADDR_LEN);
memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN); memcpy(pTxPacket->p80211Header->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
...@@ -347,9 +344,8 @@ BOOL PSbIsNextTBTTWakeUp(void *hDeviceContext) ...@@ -347,9 +344,8 @@ BOOL PSbIsNextTBTTWakeUp(void *hDeviceContext)
BOOL bWakeUp = FALSE; BOOL bWakeUp = FALSE;
if (pMgmt->wListenInterval >= 2) { if (pMgmt->wListenInterval >= 2) {
if (pMgmt->wCountToWakeUp == 0) { if (pMgmt->wCountToWakeUp == 0)
pMgmt->wCountToWakeUp = pMgmt->wListenInterval; pMgmt->wCountToWakeUp = pMgmt->wListenInterval;
}
pMgmt->wCountToWakeUp --; pMgmt->wCountToWakeUp --;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment