mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

staging: vt6656: rename CARDvSetFirstNextTBTT to vnt_reset_next_tbtt

Browse source 
Drop card, set and first. The device resets the next tbtt rename
to vnt_reset_next_tbtt

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-05-30 23:22:50 +01:00 committed by Greg Kroah-Hartman
parent 75ef1b5195
commit 6964cd1215
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/vt6656/card.c
View file

@ -31,7 +31,7 @@
* vnt_get_tsf_offset - Calculate TSFOffset * vnt_get_tsf_offset - Calculate TSFOffset
* vnt_get_current_tsf - Read Current NIC TSF counter * vnt_get_current_tsf - Read Current NIC TSF counter
* vnt_get_next_tbtt - Calculate Next Beacon TSF counter * vnt_get_next_tbtt - Calculate Next Beacon TSF counter
* CARDvSetFirstNextTBTT - Set NIC Beacon time * vnt_reset_next_tbtt - Set NIC Beacon time
* CARDvUpdateNextTBTT - Sync. NIC Beacon time * CARDvUpdateNextTBTT - Sync. NIC Beacon time
* CARDbRadioPowerOff - Turn Off NIC Radio Power * CARDbRadioPowerOff - Turn Off NIC Radio Power
* CARDbRadioPowerOn - Turn On NIC Radio Power * CARDbRadioPowerOn - Turn On NIC Radio Power
@ -689,7 +689,7 @@ u64 vnt_get_next_tbtt(u64 tsf, u16 beacon_interval)
* Return Value: none * Return Value: none
* *
*/ */
void CARDvSetFirstNextTBTT(struct vnt_private *priv, u16 beacon_interval) void vnt_reset_next_tbtt(struct vnt_private *priv, u16 beacon_interval)
{ {
u64 next_tbtt = 0; u64 next_tbtt = 0;
u8 data[8]; u8 data[8];

2
drivers/staging/vt6656/card.h
View file

@ -54,7 +54,7 @@ int vnt_ofdm_min_rate(struct vnt_private *);
void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64); void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64);
bool vnt_get_current_tsf(struct vnt_private *, u64 *); bool vnt_get_current_tsf(struct vnt_private *, u64 *);
bool vnt_clear_current_tsf(struct vnt_private *); bool vnt_clear_current_tsf(struct vnt_private *);
void CARDvSetFirstNextTBTT(struct vnt_private *pDevice, u16 wBeaconInterval); void vnt_reset_next_tbtt(struct vnt_private *, u16);
void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF, void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF,
u16 wBeaconInterval); u16 wBeaconInterval);
u64 vnt_get_next_tbtt(u64, u16); u64 vnt_get_next_tbtt(u64, u16);

4
drivers/staging/vt6656/wmgr.c
View file

@ -2051,7 +2051,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus)
// enable TSF counter // enable TSF counter
MACvRegBitsOn(pDevice,MAC_REG_TFTCTL,TFTCTL_TSFCNTREN); MACvRegBitsOn(pDevice,MAC_REG_TFTCTL,TFTCTL_TSFCNTREN);
// set Next TBTT // set Next TBTT
CARDvSetFirstNextTBTT(pDevice, pMgmt->wIBSSBeaconPeriod); vnt_reset_next_tbtt(pDevice, pMgmt->wIBSSBeaconPeriod);
pMgmt->uIBSSChannel = pDevice->uChannel; pMgmt->uIBSSChannel = pDevice->uChannel;
@ -2584,7 +2584,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
// set Next TBTT // set Next TBTT
// Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval // Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval
CARDvSetFirstNextTBTT(pDevice, pCurr->wBeaconInterval); vnt_reset_next_tbtt(pDevice, pCurr->wBeaconInterval);
// set BSSID // set BSSID
MACvWriteBSSIDAddress(pDevice, pCurr->abyBSSID); MACvWriteBSSIDAddress(pDevice, pCurr->abyBSSID);