diff options
| author | Malcolm Priestley | 2014-05-30 17:27:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-06-20 00:55:42 +0200 |
| commit | ecbc0a1e614b5a31ec38773f9054475cadac1f79 (patch) | |
| tree | c3e8d1b647dbdf00916a507aae442acb335caca1 | |
| parent | staging: vt6656: rename CARDbyGetPktType to vnt_get_pkt_type (diff) | |
| download | kernel-qcow2-linux-ecbc0a1e614b5a31ec38773f9054475cadac1f79.tar.gz kernel-qcow2-linux-ecbc0a1e614b5a31ec38773f9054475cadac1f79.tar.xz kernel-qcow2-linux-ecbc0a1e614b5a31ec38773f9054475cadac1f79.zip | |
staging: vt6656: rename CARDqGetTSFOffset to vnt_get_tsf_offset
drop card and rename to vnt_get_tsf_offset
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/card.c | 6 | ||||
| -rw-r--r-- | drivers/staging/vt6656/card.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wmgr.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 27ed88b54c59..3b51eaef5f78 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -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); diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index 7a844c34c5dc..ffd655213e46 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -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 *); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 652e8b682bdf..9381d6f1bbc6 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -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) |