From 5ff627aedbcf0a400ee402ad7b7aa14d1b8ce3d3 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Tue, 18 Mar 2014 19:24:58 +0000 Subject: [PATCH] staging: vt6656: rxtx: Replace wTxRrvTime* Fix base type to __le16 and remove camel case. Camel case changes wTxRrvTime* -> rrv_time* Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/rxtx.c | 16 ++++++++-------- drivers/staging/vt6656/rxtx.h | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 51aa77c581ab..9846c901e65f 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -823,9 +823,9 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, pBuf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); - pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); - pBuf->wTxRrvTime_b = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); @@ -846,9 +846,9 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, struct vnt_rrv_time_cts *pBuf = &tx_buffer-> tx_head.tx_cts.cts; - pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); - pBuf->wTxRrvTime_b = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK); @@ -883,7 +883,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); - pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK); /* Fill RTS */ @@ -894,7 +894,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, struct vnt_rrv_time_ab *pBuf = &tx_buffer-> tx_head.tx_ab.ab; - pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11A, cbFrameSize, wCurrentRate, bNeedACK); @@ -917,7 +917,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); - pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); @@ -929,7 +929,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, struct vnt_rrv_time_ab *pBuf = &tx_buffer-> tx_head.tx_ab.ab; - pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, + pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK); diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index 1e8f5e2c071f..f0ab2a3d70c9 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -57,20 +57,20 @@ struct vnt_rrv_time_rts { __le16 rts_rrv_time_aa; __le16 rts_rrv_time_bb; u16 wReserved; - u16 wTxRrvTime_b; - u16 wTxRrvTime_a; + __le16 rrv_time_b; + __le16 rrv_time_a; } __packed; struct vnt_rrv_time_cts { u16 wCTSTxRrvTime_ba; u16 wReserved; - u16 wTxRrvTime_b; - u16 wTxRrvTime_a; + __le16 rrv_time_b; + __le16 rrv_time_a; } __packed; struct vnt_rrv_time_ab { __le16 rts_rrv_time; - u16 wTxRrvTime; + __le16 rrv_time; } __packed; /* TX data header */ -- 2.20.1