Commit 13fe62ae authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rxtx s_vFillRTSHead create union of vnt_rts*/vnt_cts* structures. 



Only one of vnt_rts*/vnt_cts* structures are accessed at any one time.

Join these structures in to a single union.

These will eventually form the tail structure of vnt_tx_buffer and
include structures vnt_tx_datahead*

Structures in s_vFillCTSHead will join in next patch series.

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

drivers/staging/vt6656/rxtx.c

+8 −17
Original line number Diff line number Diff line
@@ -720,48 +720,39 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, 
	void *pvRTS, u32 cbFrameLength, int bNeedAck,

	struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption)

{

	union vnt_tx_data_head *head = pvRTS;



    if (pvRTS == NULL)

	if (!head)

		return;



    // Note: So far RTSHead doesn't appear in ATIM & Beacom DMA, so we don't need to take them into account.

    //       Otherwise, we need to modified codes for them.

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

        if (byFBOption == AUTO_FB_NONE) {

		struct vnt_rts_g *pBuf = (struct vnt_rts_g *)pvRTS;



		vnt_rxtx_rts_g_head(pDevice, pBuf,

		vnt_rxtx_rts_g_head(pDevice, &head->rts_g,

				psEthHeader, byPktType, cbFrameLength,

				bNeedAck, wCurrentRate, byFBOption);

        }

        else {

		struct vnt_rts_g_fb *pBuf = (struct vnt_rts_g_fb *)pvRTS;



		vnt_rxtx_rts_g_fb_head(pDevice, pBuf,

		vnt_rxtx_rts_g_fb_head(pDevice, &head->rts_g_fb,

				psEthHeader, byPktType, cbFrameLength,

				bNeedAck, wCurrentRate, byFBOption);

        } // if (byFBOption == AUTO_FB_NONE)

    }

    else if (byPktType == PK_TYPE_11A) {

        if (byFBOption == AUTO_FB_NONE) {

		struct vnt_rts_ab *pBuf = (struct vnt_rts_ab *)pvRTS;



		vnt_rxtx_rts_ab_head(pDevice, pBuf,

		vnt_rxtx_rts_ab_head(pDevice, &head->rts_ab,

				psEthHeader, byPktType, cbFrameLength,

				bNeedAck, wCurrentRate, byFBOption);

        }

        else {

		struct vnt_rts_a_fb *pBuf = (struct vnt_rts_a_fb *)pvRTS;



		vnt_rxtx_rts_a_fb_head(pDevice, pBuf,

		vnt_rxtx_rts_a_fb_head(pDevice, &head->rts_a_fb,

				psEthHeader, byPktType, cbFrameLength,

				bNeedAck, wCurrentRate, byFBOption);

        }

    }

    else if (byPktType == PK_TYPE_11B) {

	struct vnt_rts_ab *pBuf = (struct vnt_rts_ab *)pvRTS;



	vnt_rxtx_rts_ab_head(pDevice, pBuf,

	vnt_rxtx_rts_ab_head(pDevice, &head->rts_ab,

			psEthHeader, byPktType, cbFrameLength,

			bNeedAck, wCurrentRate, byFBOption);

    }

drivers/staging/vt6656/rxtx.h

+12 −0
Original line number Diff line number Diff line
@@ -168,6 +168,18 @@ struct vnt_cts_fb { 
	u16 reserved2;

} __packed;



union vnt_tx_data_head {

	/* rts g */

	struct vnt_rts_g rts_g;

	struct vnt_rts_g_fb rts_g_fb;

	/* rts a/b */

	struct vnt_rts_ab rts_ab;

	struct vnt_rts_a_fb rts_a_fb;

	/* cts g */

	struct vnt_cts cts_g;

	struct vnt_cts_fb cts_g_fb;

};



struct vnt_tx_buffer {

	u8 byType;

	u8 byPKTNO;