mirror of
https://github.com/torvalds/linux.git
synced 2024-12-31 23:31:29 +00:00
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 <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
85417bf0d7
commit
5ff627aedb
@ -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);
|
||||
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user