diff options
| author | Malcolm Priestley | 2014-05-30 17:27:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-06-20 00:55:42 +0200 |
| commit | 14c68c56695d9747a36a7ad0c462564719fddc03 (patch) | |
| tree | f0f8cab182f24a29777851bb369112e3723fca8e | |
| parent | staging: vt6656: rename CARDqGetTSFOffset to vnt_get_tsf_offset (diff) | |
| download | kernel-qcow2-linux-14c68c56695d9747a36a7ad0c462564719fddc03.tar.gz kernel-qcow2-linux-14c68c56695d9747a36a7ad0c462564719fddc03.tar.xz kernel-qcow2-linux-14c68c56695d9747a36a7ad0c462564719fddc03.zip | |
staging: vt6656: rename CARDvAdjustTSF to vnt_adjust_tsf
drop card and rename to vnt_adjust_tsf
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 | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/card.h | 3 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wmgr.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 3b51eaef5f78..24dd9f829262 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -581,7 +581,7 @@ u64 vnt_get_tsf_offset(u8 rx_rate, u64 tsf1, u64 tsf2) * Return Value: none * */ -void CARDvAdjustTSF(struct vnt_private *priv, u8 rx_rate, +void vnt_adjust_tsf(struct vnt_private *priv, u8 rx_rate, u64 time_stamp, u64 local_tsf) { u64 tsf_offset = 0; diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index ffd655213e46..75e4f5f9af79 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -51,8 +51,7 @@ void vnt_update_ifs(struct vnt_private *); 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 CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate, - u64 qwBSSTimestamp, u64 qwLocalTSF); +void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64); bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF); bool CARDbClearCurrentTSF(struct vnt_private *pDevice); void CARDvSetFirstNextTBTT(struct vnt_private *pDevice, u16 wBeaconInterval); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 9381d6f1bbc6..d5d227385a43 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -1916,7 +1916,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rejoining to Other Adhoc group with same SSID........\n"); MACvWriteBeaconInterval(pDevice, pMgmt->wCurrBeaconPeriod); - CARDvAdjustTSF(pDevice, pRxPacket->byRxRate, qwTimestamp, pRxPacket->qwLocalTSF); + vnt_adjust_tsf(pDevice, pRxPacket->byRxRate, qwTimestamp, pRxPacket->qwLocalTSF); CARDvUpdateNextTBTT(pDevice, qwTimestamp, pMgmt->wCurrBeaconPeriod); // Turn off bssid filter to avoid filter others adhoc station which bssid is different. @@ -1945,7 +1945,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) // Update TSF if (bUpdateTSF) { CARDbGetCurrentTSF(pDevice, &qwCurrTSF); - CARDvAdjustTSF(pDevice, pRxPacket->byRxRate, qwTimestamp , pRxPacket->qwLocalTSF); + vnt_adjust_tsf(pDevice, pRxPacket->byRxRate, qwTimestamp , pRxPacket->qwLocalTSF); CARDbGetCurrentTSF(pDevice, &qwCurrTSF); CARDvUpdateNextTBTT(pDevice, qwTimestamp, pMgmt->wCurrBeaconPeriod); } @@ -2577,7 +2577,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, // calculate TSF offset // TSF Offset = Received Timestamp TSF - Marked Local's TSF - CARDvAdjustTSF(pDevice, pCurr->byRxRate, pCurr->qwBSSTimestamp, pCurr->qwLocalTSF); + vnt_adjust_tsf(pDevice, pCurr->byRxRate, pCurr->qwBSSTimestamp, pCurr->qwLocalTSF); // set HW beacon interval MACvWriteBeaconInterval(pDevice, pCurr->wBeaconInterval); |