mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
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>
This commit is contained in:
parent
ecbc0a1e61
commit
14c68c5669
3 changed files with 5 additions and 6 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue