Commit b898cf21 authored by Philip Worrall's avatar Philip Worrall Committed by Greg Kroah-Hartman
Browse files

Staging: vt6656: Ensure power.c uses proper tabbing. 



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>
Reviewed-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c5b0b5fc

drivers/staging/vt6656/power.c

+10 −15
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ BOOL PSbSendNullPacket(void *hDeviceContext) 
	PSDevice pDevice = (PSDevice)hDeviceContext;

	PSTxMgmtPacket pTxPacket = NULL;

	PSMgmtObject pMgmt = &(pDevice->sMgmtObj);

	u16 flags = 0;



	if (pDevice->bLinkPass == FALSE)

		return FALSE;
@@ -287,21 +288,15 @@ BOOL PSbSendNullPacket(void *hDeviceContext) 
	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));