Commit 4f990057 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: desc.h: Move typedef struct tagSRrvTime_gCTS to new structure in rxtx.h 



To new structure.
typedef struct tagSRrvTime_gCTS -> struct vnt_rrv_time_cts

This is only needed by rxtc.c so moved to rxtx.h and
will eventually form part of the structure of
struct vnt_tx_buffer.

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

drivers/staging/vt6656/desc.h

+0 −10
Original line number Diff line number Diff line
@@ -146,16 +146,6 @@ 
/*

 * RsvTime buffer header

 */

typedef struct tagSRrvTime_gCTS {

    u16        wCTSTxRrvTime_ba;

    u16        wReserved;

    u16        wTxRrvTime_b;

    u16        wTxRrvTime_a;

} __attribute__ ((__packed__))

SRrvTime_gCTS, *PSRrvTime_gCTS;



typedef const SRrvTime_gCTS *PCSRrvTime_gCTS;



typedef struct tagSRrvTime_ab {

    u16        wRTSTxRrvTime;

    u16        wTxRrvTime;

drivers/staging/vt6656/rxtx.c

+30 −23
Original line number Diff line number Diff line
@@ -934,7 +934,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, 


            //Fill RsvTime

            if (pvRrvTime) {

                PSRrvTime_gCTS pBuf = (PSRrvTime_gCTS)pvRrvTime;

		struct vnt_rrv_time_cts *pBuf =

				(struct vnt_rrv_time_cts *)pvRrvTime;

                pBuf->wTxRrvTime_a = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM

                pBuf->wTxRrvTime_b = cpu_to_le16((u16)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK

                pBuf->wCTSTxRrvTime_ba = cpu_to_le16((u16)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz
@@ -1165,16 +1166,19 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
				sizeof(STxDataHead_g);

            }

            else { //RTS_needless

                pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);

                pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS));

		pvRrvTime = (struct vnt_rrv_time_cts *)

				(pbyTxBufferAddr + wTxBufSize);

		pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize +

			sizeof(struct vnt_rrv_time_cts));

                pvRTS = NULL;

		pvCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +

				sizeof(SRrvTime_gCTS) + cbMICHDR);

				sizeof(struct vnt_rrv_time_cts) + cbMICHDR);

		pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +

			sizeof(SRrvTime_gCTS) + cbMICHDR +

			sizeof(struct vnt_rrv_time_cts) + cbMICHDR +

						sizeof(struct vnt_cts));

		cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gCTS) + cbMICHDR +

			sizeof(struct vnt_cts) + sizeof(STxDataHead_g);

		cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +

			cbMICHDR + sizeof(struct vnt_cts) +

				sizeof(STxDataHead_g);

            }

        } else {

            // Auto Fall Back
@@ -1194,15 +1198,17 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
				sizeof(STxDataHead_g_FB);

            }

            else if (bRTS == false) { //RTS_needless

                pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);

                pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS));

		pvRrvTime = (struct vnt_rrv_time_cts *)

				(pbyTxBufferAddr + wTxBufSize);

		pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize +

				sizeof(struct vnt_rrv_time_cts));

                pvRTS = NULL;

		pvCTS = (struct vnt_cts_fb *) (pbyTxBufferAddr + wTxBufSize +

					sizeof(SRrvTime_gCTS) + cbMICHDR);

			sizeof(struct vnt_rrv_time_cts) + cbMICHDR);

		pvTxDataHd = (PSTxDataHead_g_FB) (pbyTxBufferAddr +

			wTxBufSize + sizeof(SRrvTime_gCTS) + cbMICHDR +

						sizeof(struct vnt_cts_fb));

		cbHeaderLength = wTxBufSize + sizeof(SRrvTime_gCTS) +

			wTxBufSize + sizeof(struct vnt_rrv_time_cts) +

				cbMICHDR + sizeof(struct vnt_cts_fb));

		cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +

				cbMICHDR + sizeof(struct vnt_cts_fb) +

					sizeof(STxDataHead_g_FB);

            }
@@ -1659,14 +1665,14 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 
    //Set RrvTime/RTS/CTS Buffer

    if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet



        pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);

	pvRrvTime = (struct vnt_rrv_time_cts *) (pbyTxBufferAddr + wTxBufSize);

        pMICHDR = NULL;

        pvRTS = NULL;

	pCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +

						sizeof(SRrvTime_gCTS));

					sizeof(struct vnt_rrv_time_cts));

	pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +

		sizeof(SRrvTime_gCTS) + sizeof(struct vnt_cts));

	cbHeaderSize = wTxBufSize + sizeof(SRrvTime_gCTS) +

		sizeof(struct vnt_rrv_time_cts) + sizeof(struct vnt_cts));

	cbHeaderSize = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +

		sizeof(struct vnt_cts) + sizeof(STxDataHead_g);

    }

    else { // 802.11a/b packet
@@ -2061,15 +2067,16 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
    //the rest of pTxBufHead->wFragCtl:FragTyp will be set later in s_vFillFragParameter()



    if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet



        pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);

        pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS));

	pvRrvTime = (struct vnt_rrv_time_cts *) (pbyTxBufferAddr + wTxBufSize);

	pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize +

					sizeof(struct vnt_rrv_time_cts));

        pvRTS = NULL;

	pvCTS = (struct vnt_cts *) (pbyTxBufferAddr + wTxBufSize +

			sizeof(SRrvTime_gCTS) + cbMICHDR);

			sizeof(struct vnt_rrv_time_cts) + cbMICHDR);

	pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +

		sizeof(SRrvTime_gCTS) + cbMICHDR + sizeof(struct vnt_cts));

	cbHeaderSize = wTxBufSize + sizeof(SRrvTime_gCTS) + cbMICHDR +

		sizeof(struct vnt_rrv_time_cts) + cbMICHDR +

					sizeof(struct vnt_cts));

	cbHeaderSize = wTxBufSize + sizeof(struct vnt_rrv_time_cts) + cbMICHDR +

				sizeof(struct vnt_cts) + sizeof(STxDataHead_g);



    }

drivers/staging/vt6656/rxtx.h

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ struct vnt_rrv_time_rts { 
	u16 wTxRrvTime_a;

} __packed;



struct vnt_rrv_time_cts {

	u16 wCTSTxRrvTime_ba;

	u16 wReserved;

	u16 wTxRrvTime_b;

	u16 wTxRrvTime_a;

} __packed;



/* RTS buffer header */

struct vnt_rts_g {

	u8 bySignalField_b;