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

staging: vt6656: rename CARDbGetCurrentTSF to vnt_get_current_tsf 



Drop card and rename to vnt_get_current_tsf

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

drivers/staging/vt6656/card.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 *      CARDvSetLoopbackMode - Set Loopback mode

 *      CARDbSoftwareReset - Sortware reset NIC

 *      vnt_get_tsf_offset - Calculate TSFOffset

 *      CARDbGetCurrentTSF - Read Current NIC TSF counter

 *      vnt_get_current_tsf - Read Current NIC TSF counter

 *      CARDqGetNextTBTT - Calculate Next Beacon TSF counter

 *      CARDvSetFirstNextTBTT - Set NIC Beacon time

 *      CARDvUpdateNextTBTT - Sync. NIC Beacon time
@@ -614,7 +614,7 @@ void vnt_adjust_tsf(struct vnt_private *priv, u8 rx_rate, 
 * Return Value: true if success; otherwise false

 *

 */

bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *current_tsf)

bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf)

{



	*current_tsf = priv->qwCurrTSF;

drivers/staging/vt6656/card.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void vnt_update_top_rates(struct vnt_private *); 
void vnt_add_basic_rate(struct vnt_private *, u16);

int vnt_ofdm_min_rate(struct vnt_private *);

void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64);

bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF);

bool vnt_get_current_tsf(struct vnt_private *, u64 *);

bool CARDbClearCurrentTSF(struct vnt_private *pDevice);

void CARDvSetFirstNextTBTT(struct vnt_private *pDevice, u16 wBeaconInterval);

void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF,

drivers/staging/vt6656/wmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -1944,9 +1944,9 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
    // endian issue ???

    // Update TSF

    if (bUpdateTSF) {

        CARDbGetCurrentTSF(pDevice, &qwCurrTSF);

	vnt_get_current_tsf(pDevice, &qwCurrTSF);

	vnt_adjust_tsf(pDevice, pRxPacket->byRxRate, qwTimestamp , pRxPacket->qwLocalTSF);

        CARDbGetCurrentTSF(pDevice, &qwCurrTSF);

	vnt_get_current_tsf(pDevice, &qwCurrTSF);

        CARDvUpdateNextTBTT(pDevice, qwTimestamp, pMgmt->wCurrBeaconPeriod);

    }
@@ -2044,7 +2044,7 @@ void vMgrCreateOwnIBSS(struct vnt_private *pDevice, PCMD_STATUS pStatus) 
        pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI;

    MACvWriteBeaconInterval(pDevice, pMgmt->wIBSSBeaconPeriod);



    CARDbGetCurrentTSF(pDevice, &qwCurrTSF);

    vnt_get_current_tsf(pDevice, &qwCurrTSF);

    // clear TSF counter

    CARDbClearCurrentTSF(pDevice);