Commit 9a2cffd4 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rename CARDbAddBasicRate to vnt_add_basic_rate

Drop card and rename to vnt_add_basic_rate
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a792943
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* vnt_set_rspinf - Set RSPINF * vnt_set_rspinf - Set RSPINF
* vnt_update_ifs - Update slotTime,SIFS,DIFS, and EIFS * vnt_update_ifs - Update slotTime,SIFS,DIFS, and EIFS
* vnt_update_top_rates - Update BasicTopRate * vnt_update_top_rates - Update BasicTopRate
* CARDbAddBasicRate - Add to BasicRateSet * vnt_add_basic_rate - Add to BasicRateSet
* CARDbSetBasicRate - Set Basic Tx Rate * CARDbSetBasicRate - Set Basic Tx Rate
* CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet * CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet
* CARDvSetLoopbackMode - Set Loopback mode * CARDvSetLoopbackMode - Set Loopback mode
...@@ -505,7 +505,7 @@ void vnt_update_top_rates(struct vnt_private *priv) ...@@ -505,7 +505,7 @@ void vnt_update_top_rates(struct vnt_private *priv)
* Return Value: true if succeeded; false if failed. * Return Value: true if succeeded; false if failed.
* *
*/ */
void CARDbAddBasicRate(struct vnt_private *priv, u16 rate_idx) void vnt_add_basic_rate(struct vnt_private *priv, u16 rate_idx)
{ {
priv->wBasicRate |= (1 << rate_idx); priv->wBasicRate |= (1 << rate_idx);
......
...@@ -49,7 +49,7 @@ void vnt_set_channel(struct vnt_private *, u32); ...@@ -49,7 +49,7 @@ void vnt_set_channel(struct vnt_private *, u32);
void vnt_set_rspinf(struct vnt_private *, u8); void vnt_set_rspinf(struct vnt_private *, u8);
void vnt_update_ifs(struct vnt_private *); void vnt_update_ifs(struct vnt_private *);
void vnt_update_top_rates(struct vnt_private *); void vnt_update_top_rates(struct vnt_private *);
void CARDbAddBasicRate(struct vnt_private *, u16); void vnt_add_basic_rate(struct vnt_private *, u16);
int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice); int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice);
void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate, void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate,
u64 qwBSSTimestamp, u64 qwLocalTSF); u64 qwBSSTimestamp, u64 qwLocalTSF);
......
...@@ -163,7 +163,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice, ...@@ -163,7 +163,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
* add to basic rate set, update pDevice->byTopCCKBasicRate and * add to basic rate set, update pDevice->byTopCCKBasicRate and
* pDevice->byTopOFDMBasicRate * pDevice->byTopOFDMBasicRate
*/ */
CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); vnt_add_basic_rate(pDevice, RATEwGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, DBG_PRT(MSG_LEVEL_DEBUG,
KERN_INFO"ParseMaxRate AddBasicRate: %d\n", KERN_INFO"ParseMaxRate AddBasicRate: %d\n",
RATEwGetRateIdx(byRate)); RATEwGetRateIdx(byRate));
...@@ -191,7 +191,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice, ...@@ -191,7 +191,7 @@ void RATEvParseMaxRate(struct vnt_private *pDevice,
* add to basic rate set, update pDevice->byTopCCKBasicRate and * add to basic rate set, update pDevice->byTopCCKBasicRate and
* pDevice->byTopOFDMBasicRate * pDevice->byTopOFDMBasicRate
*/ */
CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); vnt_add_basic_rate(pDevice, RATEwGetRateIdx(byRate));
DBG_PRT(MSG_LEVEL_DEBUG, DBG_PRT(MSG_LEVEL_DEBUG,
KERN_INFO"ParseMaxRate AddBasicRate: %d\n", KERN_INFO"ParseMaxRate AddBasicRate: %d\n",
RATEwGetRateIdx(byRate)); RATEwGetRateIdx(byRate));
......
...@@ -517,10 +517,10 @@ static int device_init_registers(struct vnt_private *pDevice) ...@@ -517,10 +517,10 @@ static int device_init_registers(struct vnt_private *pDevice)
* set Short Slot Time, xIFS, and RSPINF * set Short Slot Time, xIFS, and RSPINF
*/ */
if (pDevice->byBBType == BB_TYPE_11A) { if (pDevice->byBBType == BB_TYPE_11A) {
CARDbAddBasicRate(pDevice, RATE_6M); vnt_add_basic_rate(pDevice, RATE_6M);
pDevice->bShortSlotTime = true; pDevice->bShortSlotTime = true;
} else { } else {
CARDbAddBasicRate(pDevice, RATE_1M); vnt_add_basic_rate(pDevice, RATE_1M);
pDevice->bShortSlotTime = false; pDevice->bShortSlotTime = false;
} }
......
...@@ -2573,7 +2573,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, ...@@ -2573,7 +2573,7 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
pDevice->byPreambleType = 0; pDevice->byPreambleType = 0;
pDevice->wBasicRate = 0; pDevice->wBasicRate = 0;
// Set Basic Rate // Set Basic Rate
CARDbAddBasicRate((void *)pDevice, RATE_1M); vnt_add_basic_rate(pDevice, RATE_1M);
// calculate TSF offset // calculate TSF offset
// TSF Offset = Received Timestamp TSF - Marked Local's TSF // TSF Offset = Received Timestamp TSF - Marked Local's TSF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment