Commit fed5b533 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Rename function CARDbGetCurrentTSF

parent 889d1895
Loading
Loading
Loading
Loading
+5 −5
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@
 *      CARDbAddBasicRate - Add to BasicRateSet
 *      CARDbAddBasicRate - Add to BasicRateSet
 *      CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet
 *      CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet
 *      CARDqGetTSFOffset - Calculate TSFOffset
 *      CARDqGetTSFOffset - Calculate TSFOffset
 *      CARDbGetCurrentTSF - Read Current NIC TSF counter
 *      vt6655_get_current_tsf - Read Current NIC TSF counter
 *      CARDqGetNextTBTT - Calculate Next Beacon TSF counter
 *      CARDqGetNextTBTT - Calculate Next Beacon TSF counter
 *      CARDvSetFirstNextTBTT - Set NIC Beacon time
 *      CARDvSetFirstNextTBTT - Set NIC Beacon time
 *      CARDvUpdateNextTBTT - Sync. NIC Beacon time
 *      CARDvUpdateNextTBTT - Sync. NIC Beacon time
@@ -288,7 +288,7 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate,
	u64 local_tsf;
	u64 local_tsf;
	u64 qwTSFOffset = 0;
	u64 qwTSFOffset = 0;


	CARDbGetCurrentTSF(priv, &local_tsf);
	vt6655_get_current_tsf(priv, &local_tsf);


	if (qwBSSTimestamp != local_tsf) {
	if (qwBSSTimestamp != local_tsf) {
		qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp,
		qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp,
@@ -322,7 +322,7 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv,
{
{
	u64 qwNextTBTT = 0;
	u64 qwNextTBTT = 0;


	CARDbGetCurrentTSF(priv, &qwNextTBTT); /* Get Local TSF counter */
	vt6655_get_current_tsf(priv, &qwNextTBTT); /* Get Local TSF counter */


	qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
	qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);


@@ -739,7 +739,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
 *
 *
 * Return Value: true if success; otherwise false
 * Return Value: true if success; otherwise false
 */
 */
bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF)
bool vt6655_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF)
{
{
	void __iomem *iobase = priv->port_offset;
	void __iomem *iobase = priv->port_offset;
	unsigned short ww;
	unsigned short ww;
@@ -807,7 +807,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
	void __iomem *iobase = priv->port_offset;
	void __iomem *iobase = priv->port_offset;
	u64 qwNextTBTT = 0;
	u64 qwNextTBTT = 0;


	CARDbGetCurrentTSF(priv, &qwNextTBTT); /* Get Local TSF counter */
	vt6655_get_current_tsf(priv, &qwNextTBTT); /* Get Local TSF counter */


	qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
	qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
	/* Set NextTBTT */
	/* Set NextTBTT */
+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
			   unsigned short wBeaconInterval);
			   unsigned short wBeaconInterval);
void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
			 unsigned short wBeaconInterval);
			 unsigned short wBeaconInterval);
bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF);
bool vt6655_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF);
u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval);
u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval);
u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2);
u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2);
unsigned char CARDbyGetPktType(struct vnt_private *priv);
unsigned char CARDbyGetPktType(struct vnt_private *priv);
+1 −1
Original line number Original line Diff line number Diff line
@@ -1603,7 +1603,7 @@ static u64 vnt_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
	struct vnt_private *priv = hw->priv;
	struct vnt_private *priv = hw->priv;
	u64 tsf;
	u64 tsf;


	CARDbGetCurrentTSF(priv, &tsf);
	vt6655_get_current_tsf(priv, &tsf);


	return tsf;
	return tsf;
}
}