diff options
| author | Malcolm Priestley | 2014-03-18 20:24:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-03-19 17:00:18 +0100 |
| commit | 85417bf0d75066441be0c612fc6f3c14668a8735 (patch) | |
| tree | a27c5212ebd8330b3632708a44b81a3625586100 /drivers/staging/vt6656 | |
| parent | staging: vt6656: rxtx: Replace wRTSDuration* variables (diff) | |
| download | kernel-qcow2-linux-85417bf0d75066441be0c612fc6f3c14668a8735.tar.gz kernel-qcow2-linux-85417bf0d75066441be0c612fc6f3c14668a8735.tar.xz kernel-qcow2-linux-85417bf0d75066441be0c612fc6f3c14668a8735.zip | |
staging: vt6656: rxtx: Replace wRTSTxRrvTime*
Fix base type to __le16 and remove camel case.
Camel case changes
wRTSTxRrvTime* -> rts_rrv_time*
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 10 | ||||
| -rw-r--r-- | drivers/staging/vt6656/rxtx.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 1a29251edf01..51aa77c581ab 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -816,11 +816,11 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, struct vnt_rrv_time_rts *pBuf = &tx_buffer->tx_head.tx_rts.rts; - pBuf->wRTSTxRrvTime_aa = s_uGetRTSCTSRsvTime(pDevice, 2, + pBuf->rts_rrv_time_aa = s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); - pBuf->wRTSTxRrvTime_ba = s_uGetRTSCTSRsvTime(pDevice, 1, + pBuf->rts_rrv_time_ba = s_uGetRTSCTSRsvTime(pDevice, 1, byPktType, cbFrameSize, wCurrentRate); - pBuf->wRTSTxRrvTime_bb = s_uGetRTSCTSRsvTime(pDevice, 0, + pBuf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice, @@ -880,7 +880,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, struct vnt_rrv_time_ab *pBuf = &tx_buffer-> tx_head.tx_ab.ab; - pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 2, + pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate); pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, @@ -914,7 +914,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, struct vnt_rrv_time_ab *pBuf = &tx_buffer-> tx_head.tx_ab.ab; - pBuf->wRTSTxRrvTime = s_uGetRTSCTSRsvTime(pDevice, 0, + pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate); pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice, diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index bb2d0ce4c7bd..1e8f5e2c071f 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -53,9 +53,9 @@ struct vnt_mic_hdr { /* RsvTime buffer header */ struct vnt_rrv_time_rts { - u16 wRTSTxRrvTime_ba; - u16 wRTSTxRrvTime_aa; - u16 wRTSTxRrvTime_bb; + __le16 rts_rrv_time_ba; + __le16 rts_rrv_time_aa; + __le16 rts_rrv_time_bb; u16 wReserved; u16 wTxRrvTime_b; u16 wTxRrvTime_a; @@ -69,7 +69,7 @@ struct vnt_rrv_time_cts { } __packed; struct vnt_rrv_time_ab { - u16 wRTSTxRrvTime; + __le16 rts_rrv_time; u16 wTxRrvTime; } __packed; |