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

staging: vt6656: rxtx.c Camel case and clean up s_uGetTxRsvTime

White space clean.

Remove unneeded comments.

Camel case changes
pDevice
byPktType
cbFrameLength
wRate
bNeedAck

uDataTime
uAckTime

} -> {

priv
pkt_type
frame_length
rate
need_ack

data_time
ack_time
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc212550
...@@ -338,24 +338,25 @@ static u16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate) ...@@ -338,24 +338,25 @@ static u16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
PK_TYPE_11GB 2 PK_TYPE_11GB 2
PK_TYPE_11GA 3 PK_TYPE_11GA 3
*/ */
static u32 s_uGetTxRsvTime(struct vnt_private *pDevice, u8 byPktType, static u32 s_uGetTxRsvTime(struct vnt_private *priv, u8 pkt_type,
u32 cbFrameLength, u16 wRate, int bNeedAck) u32 frame_length, u16 rate, int need_ack)
{ {
u32 uDataTime, uAckTime; u32 data_time, ack_time;
uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); data_time = BBuGetFrameTime(priv->byPreambleType, pkt_type,
if (byPktType == PK_TYPE_11B) {//llb,CCK mode frame_length, rate);
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (u16)pDevice->byTopCCKBasicRate);
} else {//11g 2.4G OFDM mode & 11a 5G OFDM mode
uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (u16)pDevice->byTopOFDMBasicRate);
}
if (bNeedAck) { if (pkt_type == PK_TYPE_11B)
return (uDataTime + pDevice->uSIFS + uAckTime); ack_time = BBuGetFrameTime(priv->byPreambleType, pkt_type, 14,
} (u16)priv->byTopCCKBasicRate);
else { else
return uDataTime; ack_time = BBuGetFrameTime(priv->byPreambleType, pkt_type, 14,
} (u16)priv->byTopOFDMBasicRate);
if (need_ack)
return data_time + priv->uSIFS + ack_time;
return data_time;
} }
static u16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type, static u16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type,
......
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