diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-11 01:08:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 17:34:26 -0700 |
| commit | 7beae9a26a23c43ff0c3fda2e4f8c05a3a9f5c95 (patch) | |
| tree | 3d8c8e911cf3cee6dd735d6e5a6aa90917c5a21a /drivers/staging/vt6656/rxtx.c | |
| parent | 22505b258be0c112b71ef5a794579965c540188f (diff) | |
staging: vt6656: s_uGetRTSCTSDuration remove camel case
camel case changes
pDevice -> priv
byDurType -> dur_type
cbFrameLength -> frame_length
byPktType -> pkt_type
wRate -> rate
bNeedAck -> need_ack
uCTSTime -> cts_time
uDurTime -> dur_time
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/rxtx.c')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index f8c232359e0d..0e853c16b95e 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -92,9 +92,9 @@ static __le16 s_uGetRTSCTSRsvTime(struct vnt_private *priv, static __le16 s_uGetDataDuration(struct vnt_private *pDevice, u8 byPktType, int bNeedAck); -static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, - u8 byDurType, u32 cbFrameLength, u8 byPktType, u16 wRate, - int bNeedAck); +static __le16 s_uGetRTSCTSDuration(struct vnt_private *priv, + u8 dur_type, u32 frame_length, u8 pkt_type, u16 rate, + int need_ack); static struct vnt_usb_send_context *s_vGetFreeContext(struct vnt_private *priv) @@ -229,45 +229,45 @@ static __le16 s_uGetDataDuration(struct vnt_private *pDevice, } //byFreqType: 0=>5GHZ 1=>2.4GHZ -static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice, u8 byDurType, - u32 cbFrameLength, u8 byPktType, u16 wRate, int bNeedAck) +static __le16 s_uGetRTSCTSDuration(struct vnt_private *priv, u8 dur_type, + u32 frame_length, u8 pkt_type, u16 rate, int need_ack) { - u32 uCTSTime = 0, uDurTime = 0; + u32 cts_time = 0, dur_time = 0; - switch (byDurType) { + switch (dur_type) { case RTSDUR_BB: case RTSDUR_BA: case RTSDUR_BA_F0: case RTSDUR_BA_F1: - uCTSTime = vnt_get_frame_time(pDevice->byPreambleType, - byPktType, 14, pDevice->byTopCCKBasicRate); - uDurTime = uCTSTime + 2 * pDevice->uSIFS + - s_uGetTxRsvTime(pDevice, byPktType, - cbFrameLength, wRate, bNeedAck); + cts_time = vnt_get_frame_time(priv->byPreambleType, + pkt_type, 14, priv->byTopCCKBasicRate); + dur_time = cts_time + 2 * priv->uSIFS + + s_uGetTxRsvTime(priv, pkt_type, + frame_length, rate, need_ack); break; case RTSDUR_AA: case RTSDUR_AA_F0: case RTSDUR_AA_F1: - uCTSTime = vnt_get_frame_time(pDevice->byPreambleType, - byPktType, 14, pDevice->byTopOFDMBasicRate); - uDurTime = uCTSTime + 2 * pDevice->uSIFS + - s_uGetTxRsvTime(pDevice, byPktType, - cbFrameLength, wRate, bNeedAck); + cts_time = vnt_get_frame_time(priv->byPreambleType, + pkt_type, 14, priv->byTopOFDMBasicRate); + dur_time = cts_time + 2 * priv->uSIFS + + s_uGetTxRsvTime(priv, pkt_type, + frame_length, rate, need_ack); break; case CTSDUR_BA: case CTSDUR_BA_F0: case CTSDUR_BA_F1: - uDurTime = pDevice->uSIFS + s_uGetTxRsvTime(pDevice, - byPktType, cbFrameLength, wRate, bNeedAck); + dur_time = priv->uSIFS + s_uGetTxRsvTime(priv, + pkt_type, frame_length, rate, need_ack); break; default: break; } - return cpu_to_le16((u16)uDurTime); + return cpu_to_le16((u16)dur_time); } static u16 vnt_mac_hdr_pos(struct vnt_usb_send_context *tx_context, |