diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-19 20:32:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-19 15:23:21 -0700 |
| commit | 3b5a89ca3db0f8c816aa0590d3b2955df63d3d01 (patch) | |
| tree | a105dcf5af1a05f6be29a06d3b265a8c6742a089 | |
| parent | 4d99952df1d6a4ef14013fe315a44fcd6bdd9f59 (diff) | |
staging: vt6656: BBuGetFrameTime remove uRateIdx
Remove uRateIdx and rename wRate tx_rate
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/baseband.c | 13 | ||||
| -rw-r--r-- | drivers/staging/vt6656/baseband.h | 9 |
2 files changed, 8 insertions, 14 deletions
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index dbe06f9ec4c8..baa3858fee66 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -657,27 +657,26 @@ s_vClearSQ3Value(PSDevice pDevice); * byPreambleType - Preamble Type * byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA * cbFrameLength - Baseband Type - * wRate - Tx Rate + * tx_rate - Tx Rate * Out: * * Return Value: FrameTime * */ -unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType, - unsigned int cbFrameLength, u16 wRate) +unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType, + unsigned int cbFrameLength, u16 tx_rate) { unsigned int uFrameTime; unsigned int uPreamble; unsigned int uTmp; - unsigned int uRateIdx = (unsigned int)wRate; unsigned int uRate = 0; - if (uRateIdx > RATE_54M) + if (tx_rate > RATE_54M) return 0; - uRate = (unsigned int)awcFrameTime[uRateIdx]; + uRate = (unsigned int)awcFrameTime[tx_rate]; - if (uRateIdx <= 3) { + if (tx_rate <= 3) { if (byPreambleType == 1) uPreamble = 96; else diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h index 79faedf4a5e9..08c24a3b3189 100644 --- a/drivers/staging/vt6656/baseband.h +++ b/drivers/staging/vt6656/baseband.h @@ -88,13 +88,8 @@ struct vnt_phy_field { __le16 len; } __packed; -unsigned int -BBuGetFrameTime( - u8 byPreambleType, - u8 byFreqType, - unsigned int cbFrameLength, - u16 wRate - ); +unsigned int BBuGetFrameTime(u8 byPreambleType, u8 byPktType, + unsigned int cbFrameLength, u16 tx_rate); void BBvCalculateParameter(struct vnt_private *, u32 cbFrameLength, u16 wRate, u8 byPacketType, struct vnt_phy_field *); |