aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Priestley <[email protected]>2014-07-11 01:08:21 +0100
committerGreg Kroah-Hartman <[email protected]>2014-07-11 17:34:26 -0700
commita4c2a8a4f3e4454cce89a79dfa2c816ed93b462a (patch)
treebc2442adb348067227b9b63b5491dadc7abba40a
parentf2aabee60712099429f81ada389400e4683a2272 (diff)
staging: vt6656: s_uGetDataDuration remove camel case
camel case changes pDevice -> priv byPktType -> pkt_type bNeedAck -> need_ack uAckTime -> ack_time Signed-off-by: Malcolm Priestley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/vt6656/rxtx.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index c994c080c147..a89f7fd5a926 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -210,19 +210,20 @@ static __le16 s_uGetRTSCTSRsvTime(struct vnt_private *priv,
}
//byFreqType 0: 5GHz, 1:2.4Ghz
-static __le16 s_uGetDataDuration(struct vnt_private *pDevice,
- u8 byPktType, int bNeedAck)
+static __le16 s_uGetDataDuration(struct vnt_private *piv,
+ u8 pkt_type, int need_ack)
{
- u32 uAckTime = 0;
+ u32 ack_time = 0;
- if (bNeedAck) {
- if (byPktType == PK_TYPE_11B)
- uAckTime = vnt_get_frame_time(pDevice->byPreambleType,
- byPktType, 14, pDevice->byTopCCKBasicRate);
+ if (need_ack) {
+ if (pkt_type == PK_TYPE_11B)
+ ack_time = vnt_get_frame_time(piv->byPreambleType,
+ pkt_type, 14, piv->byTopCCKBasicRate);
else
- uAckTime = vnt_get_frame_time(pDevice->byPreambleType,
- byPktType, 14, pDevice->byTopOFDMBasicRate);
- return cpu_to_le16((u16)(pDevice->uSIFS + uAckTime));
+ ack_time = vnt_get_frame_time(piv->byPreambleType,
+ pkt_type, 14, piv->byTopOFDMBasicRate);
+
+ return cpu_to_le16((u16)(piv->uSIFS + ack_time));
}
return 0;