Commit 7c05c545 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

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



To new structure.
typedef struct tagSTxDataHead_g_FB -> struct vnt_tx_datahead_g_fb

This is only needed by rxtc.c so moved to rxtx.h visible to
vnt_rts*/vnt_cts* 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 7e60a3de

drivers/staging/vt6656/desc.h

+0 −17
Original line number Diff line number Diff line
@@ -166,23 +166,6 @@ typedef const STxShortBufHead *PCSTxShortBufHead; 
/*

 * TX data header

 */

typedef struct tagSTxDataHead_g_FB {

    u8    bySignalField_b;

    u8    byServiceField_b;

    u16    wTransmitLength_b;

    u8    bySignalField_a;

    u8    byServiceField_a;

    u16    wTransmitLength_a;

    u16    wDuration_b;

    u16    wDuration_a;

    u16    wDuration_a_f0;

    u16    wDuration_a_f1;

    u16    wTimeStampOff_b;

    u16    wTimeStampOff_a;

} __attribute__ ((__packed__))

STxDataHead_g_FB, *PSTxDataHead_g_FB;

typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB;



typedef struct tagSTxDataHead_ab {

    u8    bySignalField;

    u8    byServiceField;

drivers/staging/vt6656/rxtx.c

+8 −7
Original line number Diff line number Diff line
@@ -535,7 +535,8 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
                return (pBuf->wDuration_a);

             } else {

                // Auto Fallback

                PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead;

		struct vnt_tx_datahead_g_fb *pBuf =

			(struct vnt_tx_datahead_g_fb *)pTxDataHead;

                //Get SignalField,ServiceField,Length

                BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,

                    (u16 *)&(pBuf->wTransmitLength_a), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a)
@@ -1195,12 +1196,12 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
		pvRTS = (struct vnt_rts_g_fb *) (pbyTxBufferAddr + wTxBufSize +

				sizeof(struct vnt_rrv_time_rts) + cbMICHDR);

                pvCTS = NULL;

		pvTxDataHd = (PSTxDataHead_g_FB) (pbyTxBufferAddr + wTxBufSize +

			sizeof(struct vnt_rrv_time_rts) + cbMICHDR +

					sizeof(struct vnt_rts_g_fb));

		pvTxDataHd = (struct vnt_tx_datahead_g_fb *) (pbyTxBufferAddr +

			wTxBufSize + sizeof(struct vnt_rrv_time_rts) +

				cbMICHDR + sizeof(struct vnt_rts_g_fb));

		cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_rts) +

			cbMICHDR + sizeof(struct vnt_rts_g_fb) +

				sizeof(STxDataHead_g_FB);

				sizeof(struct vnt_tx_datahead_g_fb);

            }

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

		pvRrvTime = (struct vnt_rrv_time_cts *)
@@ -1210,12 +1211,12 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
                pvRTS = NULL;

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

			sizeof(struct vnt_rrv_time_cts) + cbMICHDR);

		pvTxDataHd = (PSTxDataHead_g_FB) (pbyTxBufferAddr +

		pvTxDataHd = (struct vnt_tx_datahead_g_fb *) (pbyTxBufferAddr +

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

					sizeof(struct vnt_tx_datahead_g_fb);

            }

        } // Auto Fall Back

    }

drivers/staging/vt6656/rxtx.h

+15 −0
Original line number Diff line number Diff line
@@ -68,6 +68,21 @@ struct vnt_tx_datahead_g { 
	u16 wTimeStampOff_a;

} __packed;



struct vnt_tx_datahead_g_fb {

	u8 bySignalField_b;

	u8 byServiceField_b;

	u16 wTransmitLength_b;

	u8 bySignalField_a;

	u8 byServiceField_a;

	u16 wTransmitLength_a;

	u16 wDuration_b;

	u16 wDuration_a;

	u16 wDuration_a_f0;

	u16 wDuration_a_f1;

	u16 wTimeStampOff_b;

	u16 wTimeStampOff_a;

} __packed;



/* RTS buffer header */

struct vnt_rts_g {

	u8 bySignalField_b;

CRA Git | Maintained and supported by SUSTech CRA and CCSE