Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ff627ae authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rxtx: Replace wTxRrvTime* 



Fix base type to __le16 and remove camel case.

Camel case changes
wTxRrvTime* -> rrv_time*

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85417bf0

drivers/staging/vt6656/rxtx.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -823,9 +823,9 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 
			pBuf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(pDevice, 0,

			pBuf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(pDevice, 0,

				byPktType, cbFrameSize, wCurrentRate);

				byPktType, cbFrameSize, wCurrentRate);





			pBuf->wTxRrvTime_a = vnt_rxtx_rsvtime_le16(pDevice,

			pBuf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice,

				byPktType, cbFrameSize, wCurrentRate, bNeedACK);

				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,

					PK_TYPE_11B, cbFrameSize,

					pDevice->byTopCCKBasicRate, bNeedACK);

					pDevice->byTopCCKBasicRate, bNeedACK);
@@ -846,9 +846,9 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 
			struct vnt_rrv_time_cts *pBuf = &tx_buffer->

			struct vnt_rrv_time_cts *pBuf = &tx_buffer->

							tx_head.tx_cts.cts;

							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);

				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,

				PK_TYPE_11B, cbFrameSize,

					pDevice->byTopCCKBasicRate, bNeedACK);

					pDevice->byTopCCKBasicRate, bNeedACK);
@@ -883,7 +883,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 
			pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 2,

			pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 2,

				byPktType, cbFrameSize, wCurrentRate);

				byPktType, cbFrameSize, wCurrentRate);





			pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,

			pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,

				byPktType, cbFrameSize, wCurrentRate, bNeedACK);

				byPktType, cbFrameSize, wCurrentRate, bNeedACK);





			/* Fill RTS */

			/* Fill RTS */
@@ -894,7 +894,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 
			struct vnt_rrv_time_ab *pBuf = &tx_buffer->

			struct vnt_rrv_time_ab *pBuf = &tx_buffer->

							tx_head.tx_ab.ab;

							tx_head.tx_ab.ab;





			pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,

			pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,

				PK_TYPE_11A, cbFrameSize,

				PK_TYPE_11A, cbFrameSize,

					wCurrentRate, bNeedACK);

					wCurrentRate, bNeedACK);
@@ -917,7 +917,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 
			pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 0,

			pBuf->rts_rrv_time = s_uGetRTSCTSRsvTime(pDevice, 0,

				byPktType, cbFrameSize, wCurrentRate);

				byPktType, cbFrameSize, wCurrentRate);





			pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,

			pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,

				PK_TYPE_11B, cbFrameSize, wCurrentRate,

				PK_TYPE_11B, cbFrameSize, wCurrentRate,

								bNeedACK);

								bNeedACK);
@@ -929,7 +929,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 
			struct vnt_rrv_time_ab *pBuf = &tx_buffer->

			struct vnt_rrv_time_ab *pBuf = &tx_buffer->

							tx_head.tx_ab.ab;

							tx_head.tx_ab.ab;





			pBuf->wTxRrvTime = vnt_rxtx_rsvtime_le16(pDevice,

			pBuf->rrv_time = vnt_rxtx_rsvtime_le16(pDevice,

				PK_TYPE_11B, cbFrameSize,

				PK_TYPE_11B, cbFrameSize,

					wCurrentRate, bNeedACK);

					wCurrentRate, bNeedACK);

drivers/staging/vt6656/rxtx.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -57,20 +57,20 @@ struct vnt_rrv_time_rts { 
	__le16 rts_rrv_time_aa;

	__le16 rts_rrv_time_aa;

	__le16 rts_rrv_time_bb;

	__le16 rts_rrv_time_bb;

	u16 wReserved;

	u16 wReserved;

	u16 wTxRrvTime_b;

	__le16 rrv_time_b;

	u16 wTxRrvTime_a;

	__le16 rrv_time_a;

} __packed;

} __packed;





struct vnt_rrv_time_cts {

struct vnt_rrv_time_cts {

	u16 wCTSTxRrvTime_ba;

	u16 wCTSTxRrvTime_ba;

	u16 wReserved;

	u16 wReserved;

	u16 wTxRrvTime_b;

	__le16 rrv_time_b;

	u16 wTxRrvTime_a;

	__le16 rrv_time_a;

} __packed;

} __packed;





struct vnt_rrv_time_ab {

struct vnt_rrv_time_ab {

	__le16 rts_rrv_time;

	__le16 rts_rrv_time;

	u16 wTxRrvTime;

	__le16 rrv_time;

} __packed;

} __packed;





/* TX data header */

/* TX data header */