[PATCH 6/7] Staging: vt6656: Ensure power.c uses proper tabbing.
Philip Worrall
philip.worrall at googlemail.com
Wed Mar 2 17:36:35 UTC 2011
Simplify setting of power state in power.c when sending power
state notifications to the access point.
Signed-off-by: Philip Worrall <philip.worrall at googlemail.com>
---
drivers/staging/vt6656/power.c | 25 +++++++++--------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index e8c1b35..d85145f 100644
--- a/drivers/staging/vt6656/power.c 2011-03-02 17:04:26.894677000 +0000
+++ b/drivers/staging/vt6656/power.c 2011-03-02 17:17:42.304677001 +0000
@@ -274,6 +274,7 @@
PSDevice pDevice = (PSDevice)hDeviceContext;
PSTxMgmtPacket pTxPacket = NULL;
PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
+ u16 flags = 0;
if (pDevice->bLinkPass == FALSE)
return FALSE;
@@ -287,21 +288,15 @@
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));
- if (pDevice->bEnablePSMode) {
- pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(
- (
- WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |
- WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL) |
- WLAN_SET_FC_PWRMGT(1)
- ));
- } else {
- pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(
- (
- WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |
- WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL) |
- WLAN_SET_FC_PWRMGT(0)
- ));
- }
+ flags = WLAN_SET_FC_FTYPE(WLAN_TYPE_DATA) |
+ WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_NULL);
+
+ if (pDevice->bEnablePSMode)
+ flags |= WLAN_SET_FC_PWRMGT(1);
+ else
+ flags |= WLAN_SET_FC_PWRMGT(0);
+
+ pTxPacket->p80211Header->sA3.wFrameCtl = cpu_to_le16(flags);
if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA)
pTxPacket->p80211Header->sA3.wFrameCtl |= cpu_to_le16((WORD)WLAN_SET_FC_TODS(1));
More information about the devel
mailing list