Commit 1da4ee20 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: desc.h remove typedef tagSTxDataHead_a_FB to new structure in rxtx.h 



To new structure.
typedef struct tagSTxDataHead_a_FB -> struct vnt_tx_datahead_a_fb

This is only needed by rxtc.c so moved to rxtx.h visible to
vnt_rts* structures which it will eventually form part of
their structure.

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

drivers/staging/vt6656/desc.h

+0 −15
Original line number Diff line number Diff line
@@ -163,21 +163,6 @@ typedef struct tagSTxShortBufHead { 
STxShortBufHead, *PSTxShortBufHead;

typedef const STxShortBufHead *PCSTxShortBufHead;



/*

 * TX data header

 */

typedef struct tagSTxDataHead_a_FB {

    u8    bySignalField;

    u8    byServiceField;

    u16    wTransmitLength;

    u16    wDuration;

    u16    wTimeStampOff;

    u16    wDuration_f0;

    u16    wDuration_f1;

} __attribute__ ((__packed__))

STxDataHead_a_FB, *PSTxDataHead_a_FB;

typedef const STxDataHead_a_FB *PCSTxDataHead_a_FB;



/*

 * MICHDR data header

 */

drivers/staging/vt6656/rxtx.c

+8 −7
Original line number Diff line number Diff line
@@ -563,7 +563,8 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
    else if (byPktType == PK_TYPE_11A) {

        if ((byFBOption != AUTO_FB_NONE) && (uDMAIdx != TYPE_ATIMDMA) && (uDMAIdx != TYPE_BEACONDMA)) {

            // Auto Fallback

            PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead;

		struct vnt_tx_datahead_a_fb *pBuf =

			(struct vnt_tx_datahead_a_fb *)pTxDataHead;

            //Get SignalField,ServiceField,Length

            BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,

                (u16 *)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField)
@@ -1262,12 +1263,12 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
		pvRTS = (struct vnt_rts_a_fb *) (pbyTxBufferAddr + wTxBufSize +

				sizeof(struct vnt_rrv_time_ab) + cbMICHDR);

                pvCTS = NULL;

		pvTxDataHd = (PSTxDataHead_a_FB) (pbyTxBufferAddr + wTxBufSize +

			sizeof(struct vnt_rrv_time_ab) + cbMICHDR +

		pvTxDataHd = (struct vnt_tx_datahead_a_fb *)(pbyTxBufferAddr +

			wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR +

					sizeof(struct vnt_rts_a_fb));

		cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +

			cbMICHDR + sizeof(struct vnt_rts_a_fb) +

					sizeof(STxDataHead_a_FB);

					sizeof(struct vnt_tx_datahead_a_fb);

            }

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

		pvRrvTime = (struct vnt_rrv_time_ab *)(pbyTxBufferAddr +
@@ -1276,10 +1277,10 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
						sizeof(struct vnt_rrv_time_ab));

                pvRTS = NULL;

                pvCTS = NULL;

		pvTxDataHd = (PSTxDataHead_a_FB) (pbyTxBufferAddr + wTxBufSize +

			sizeof(struct vnt_rrv_time_ab) + cbMICHDR);

		pvTxDataHd = (struct vnt_tx_datahead_a_fb *)(pbyTxBufferAddr +

			wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR);

		cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +

			cbMICHDR + sizeof(STxDataHead_a_FB);

			cbMICHDR + sizeof(struct vnt_tx_datahead_a_fb);

            }

        } // Auto Fall Back

    }

drivers/staging/vt6656/rxtx.h

+10 −0
Original line number Diff line number Diff line
@@ -91,6 +91,16 @@ struct vnt_tx_datahead_ab { 
	u16 wTimeStampOff;

} __packed;



struct vnt_tx_datahead_a_fb {

	u8 bySignalField;

	u8 byServiceField;

	u16 wTransmitLength;

	u16 wDuration;

	u16 wTimeStampOff;

	u16 wDuration_f0;

	u16 wDuration_f1;

} __packed;



/* RTS buffer header */

struct vnt_rts_g {

	u8 bySignalField_b;

CRA Git | Maintained and supported by SUSTech CRA and CCSE