Commit 24cdd90f authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: s_vGenerateTxParameter Parse out struct vnt_rrv_time_rts 



Creat new function vnt_rxtx_rts that will eventually carry onward
functions.

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

drivers/staging/vt6656/rxtx.c

+24 −15
Original line number Diff line number Diff line
@@ -629,6 +629,28 @@ static u16 s_vFillCTSHead(struct vnt_usb_send_context *tx_context, 
	return 0;

}



static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,

	union vnt_tx_head *tx_head, u8 pkt_type, u32 frame_size,

	int need_ack, u16 current_rate)

{

	struct vnt_private *priv = tx_context->priv;

	struct vnt_rrv_time_rts *buf = &tx_head->tx_rts.rts;



	buf->rts_rrv_time_aa = s_uGetRTSCTSRsvTime(priv, 2,

				pkt_type, frame_size, current_rate);

	buf->rts_rrv_time_ba = s_uGetRTSCTSRsvTime(priv, 1,

				pkt_type, frame_size, current_rate);

	buf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(priv, 0,

				pkt_type, frame_size, current_rate);



	buf->rrv_time_a = vnt_rxtx_rsvtime_le16(priv, pkt_type, frame_size,

							current_rate, need_ack);

	buf->rrv_time_b = vnt_rxtx_rsvtime_le16(priv, PK_TYPE_11B, frame_size,

					priv->byTopCCKBasicRate, need_ack);



	return 0;

}



/*+

 *

 * Description:
@@ -661,21 +683,8 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context, 


	if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {

		if (need_rts) {

			struct vnt_rrv_time_rts *pBuf =

					&tx_buffer->tx_head.tx_rts.rts;



			pBuf->rts_rrv_time_aa = s_uGetRTSCTSRsvTime(pDevice, 2,

					byPktType, cbFrameSize, wCurrentRate);

			pBuf->rts_rrv_time_ba = s_uGetRTSCTSRsvTime(pDevice, 1,

					byPktType, cbFrameSize, wCurrentRate);

			pBuf->rts_rrv_time_bb = s_uGetRTSCTSRsvTime(pDevice, 0,

				byPktType, cbFrameSize, wCurrentRate);



			pBuf->rrv_time_a = vnt_rxtx_rsvtime_le16(pDevice,

				byPktType, cbFrameSize, wCurrentRate, bNeedACK);

			pBuf->rrv_time_b = vnt_rxtx_rsvtime_le16(pDevice,

					PK_TYPE_11B, cbFrameSize,

					pDevice->byTopCCKBasicRate, bNeedACK);

			vnt_rxtx_rts(tx_context, &tx_buffer->tx_head,

				byPktType, cbFrameSize, bNeedACK, wCurrentRate);



			if (need_mic) {

				*mic_hdr = &tx_buffer->