Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e99d357c authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: mac80211 conversion: enable power saving 



Convert PSvEnablePowerSaving and PSvEnablePowerSaving

Remove mgmt->wCurrAID and use pDevice->current_aid

We nolonger send the PSbSendNullPacket.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9563742

drivers/staging/vt6655/power.c

+3 −12
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ PSvEnablePowerSaving( 
)

{

	struct vnt_private *pDevice = hDeviceContext;

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	unsigned short wAID = pMgmt->wCurrAID | BIT14 | BIT15;

	u16 wAID = pDevice->current_aid | BIT(14) | BIT(15);



	// set period of power up before TBTT

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_PWBT, C_PWBT);
@@ -83,7 +82,9 @@ PSvEnablePowerSaving( 
		VNSvOutPortW(pDevice->PortOffset + MAC_REG_AIDATIM, wAID);

	} else {

		// set ATIM Window

#if 0 /* TODO atim window */

		MACvWriteATIMW(pDevice->PortOffset, pMgmt->wCurrATIMWindow);

#endif

	}

	// Set AutoSleep

	MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
@@ -95,22 +96,15 @@ PSvEnablePowerSaving( 
		MACvRegBitsOff(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN);

		// first time set listen next beacon

		MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_LNBCN);

		pMgmt->wCountToWakeUp = wListenInterval;

	} else {

		// always listen beacon

		MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN);

		pMgmt->wCountToWakeUp = 0;

	}



	// enable power saving hw function

	MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN);

	pDevice->bEnablePSMode = true;



	/* We don't send null pkt in ad hoc mode since beacon will handle this. */

	if (pDevice->op_mode != NL80211_IFTYPE_ADHOC &&

	    pDevice->op_mode == NL80211_IFTYPE_STATION)

		PSbSendNullPacket(pDevice);



	pDevice->bPWBitOn = true;

	pr_debug("PS:Power Saving Mode Enable...\n");

}
@@ -143,9 +137,6 @@ PSvDisablePowerSaving( 


	pDevice->bEnablePSMode = false;



	if (pDevice->op_mode == NL80211_IFTYPE_STATION)

		PSbSendNullPacket(pDevice);



	pDevice->bPWBitOn = false;

}