diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-30 23:22:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-19 15:56:49 -0700 |
| commit | 6964cd1215315477b1645d5cf2e2f09648d9a66a (patch) | |
| tree | bc662ecdef574276ea22b8f3c283e8de41c337af /drivers/staging/vt6656 | |
| parent | 75ef1b5195311993d148ca98e061f08f9f573d6d (diff) | |
staging: vt6656: rename CARDvSetFirstNextTBTT to vnt_reset_next_tbtt
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>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/card.c | 4 | ||||
| -rw-r--r-- | drivers/staging/vt6656/card.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wmgr.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index ee013a30d372..7cb7bbc69fd6 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -31,7 +31,7 @@ * vnt_get_tsf_offset - Calculate TSFOffset * vnt_get_current_tsf - Read Current NIC 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 * CARDbRadioPowerOff - Turn Off 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 * */ -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; u8 data[8]; diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index d39a0a51fcf5..768515c2503d 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -54,7 +54,7 @@ int vnt_ofdm_min_rate(struct vnt_private *); void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64); bool vnt_get_current_tsf(struct vnt_private *, u64 *); 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, u16 wBeaconInterval); u64 vnt_get_next_tbtt(u64, u16); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 5b2e9e57ef41..28112ec8314c 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -2051,7 +2051,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) // enable TSF counter MACvRegBitsOn(pDevice,MAC_REG_TFTCTL,TFTCTL_TSFCNTREN); // set Next TBTT - CARDvSetFirstNextTBTT(pDevice, pMgmt->wIBSSBeaconPeriod); + vnt_reset_next_tbtt(pDevice, pMgmt->wIBSSBeaconPeriod); pMgmt->uIBSSChannel = pDevice->uChannel; @@ -2584,7 +2584,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, // set Next TBTT // Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval - CARDvSetFirstNextTBTT(pDevice, pCurr->wBeaconInterval); + vnt_reset_next_tbtt(pDevice, pCurr->wBeaconInterval); // set BSSID MACvWriteBSSIDAddress(pDevice, pCurr->abyBSSID); |