Commit 3b5a89ca authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: BBuGetFrameTime remove uRateIdx

Remove uRateIdx and rename wRate tx_rate
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d99952d
...@@ -657,27 +657,26 @@ s_vClearSQ3Value(PSDevice pDevice); ...@@ -657,27 +657,26 @@ s_vClearSQ3Value(PSDevice pDevice);
* byPreambleType - Preamble Type * byPreambleType - Preamble Type
* byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA * byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA
* cbFrameLength - Baseband Type * cbFrameLength - Baseband Type
* wRate - Tx Rate * tx_rate - Tx Rate
* Out: * Out:
* *
* Return Value: FrameTime * Return Value: FrameTime
* *
*/ */
unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType, unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType,
unsigned int cbFrameLength, u16 wRate) unsigned int cbFrameLength, u16 tx_rate)
{ {
unsigned int uFrameTime; unsigned int uFrameTime;
unsigned int uPreamble; unsigned int uPreamble;
unsigned int uTmp; unsigned int uTmp;
unsigned int uRateIdx = (unsigned int)wRate;
unsigned int uRate = 0; unsigned int uRate = 0;
if (uRateIdx > RATE_54M) if (tx_rate > RATE_54M)
return 0; return 0;
uRate = (unsigned int)awcFrameTime[uRateIdx]; uRate = (unsigned int)awcFrameTime[tx_rate];
if (uRateIdx <= 3) { if (tx_rate <= 3) {
if (byPreambleType == 1) if (byPreambleType == 1)
uPreamble = 96; uPreamble = 96;
else else
......
...@@ -88,13 +88,8 @@ struct vnt_phy_field { ...@@ -88,13 +88,8 @@ struct vnt_phy_field {
__le16 len; __le16 len;
} __packed; } __packed;
unsigned int unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType,
BBuGetFrameTime( unsigned int cbFrameLength, u16 tx_rate);
u8 byPreambleType,
u8 byFreqType,
unsigned int cbFrameLength,
u16 wRate
);
void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength, void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength,
u16 wRate, u8 byPacketType, struct vnt_phy_field *); u16 wRate, u8 byPacketType, struct vnt_phy_field *);
......
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