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

staging: vt6656: rename CARDqGetTSFOffset to vnt_get_tsf_offset 



drop card and rename to vnt_get_tsf_offset

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

drivers/staging/vt6656/card.c

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 *      vnt_ofdm_min_rate - Check if any OFDM rate is in BasicRateSet

 *      CARDvSetLoopbackMode - Set Loopback mode

 *      CARDbSoftwareReset - Sortware reset NIC

 *      CARDqGetTSFOffset - Calculate TSFOffset

 *      vnt_get_tsf_offset - Calculate TSFOffset

 *      CARDbGetCurrentTSF - Read Current NIC TSF counter

 *      CARDqGetNextTBTT - Calculate Next Beacon TSF counter

 *      CARDvSetFirstNextTBTT - Set NIC Beacon time
@@ -552,7 +552,7 @@ u8 vnt_get_pkt_type(struct vnt_private *priv) 
 * Return Value: TSF Offset value

 *

 */

u64 CARDqGetTSFOffset(u8 rx_rate, u64 tsf1, u64 tsf2)

u64 vnt_get_tsf_offset(u8 rx_rate, u64 tsf1, u64 tsf2)

{

	u64 tsf_offset = 0;

	u16 rx_bcn_offset = 0;
@@ -587,7 +587,7 @@ void CARDvAdjustTSF(struct vnt_private *priv, u8 rx_rate, 
	u64 tsf_offset = 0;

	u8 data[8];



	tsf_offset = CARDqGetTSFOffset(rx_rate, time_stamp, local_tsf);

	tsf_offset = vnt_get_tsf_offset(rx_rate, time_stamp, local_tsf);



	data[0] = (u8)tsf_offset;

	data[1] = (u8)(tsf_offset >> 8);

drivers/staging/vt6656/card.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *pDevice, u16 wBeaconInterval); 
void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF,

			 u16 wBeaconInterval);

u64 CARDqGetNextTBTT(u64 qwTSF, u16 wBeaconInterval);

u64 CARDqGetTSFOffset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2);

u64 vnt_get_tsf_offset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2);

int CARDbRadioPowerOff(struct vnt_private *pDevice);

int CARDbRadioPowerOn(struct vnt_private *pDevice);

u8 vnt_get_pkt_type(struct vnt_private *);

drivers/staging/vt6656/wmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -1750,10 +1750,10 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) 
		bTSFOffsetPostive = false;



    if (bTSFOffsetPostive) {

        qwTSFOffset = CARDqGetTSFOffset(pRxPacket->byRxRate, (qwTimestamp), (qwLocalTSF));

	qwTSFOffset = vnt_get_tsf_offset(pRxPacket->byRxRate, (qwTimestamp), (qwLocalTSF));

    }

    else {

        qwTSFOffset = CARDqGetTSFOffset(pRxPacket->byRxRate, (qwLocalTSF), (qwTimestamp));

	qwTSFOffset = vnt_get_tsf_offset(pRxPacket->byRxRate, (qwLocalTSF), (qwTimestamp));

    }



	if (qwTSFOffset > TRIVIAL_SYNC_DIFFERENCE)