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

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



To new structure.
typedef struct tagSTxDataHead_g -> struct vnt_tx_datahead_g

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 57107d43

drivers/staging/vt6656/desc.h

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

 * TX data header

 */

typedef struct tagSTxDataHead_g {

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

    u16    wTimeStampOff_a;

} __attribute__ ((__packed__))

STxDataHead_g, *PSTxDataHead_g;



typedef const STxDataHead_g *PCSTxDataHead_g;



typedef struct tagSTxDataHead_g_FB {

    u8    bySignalField_b;

    u8    byServiceField_b;

drivers/staging/vt6656/rxtx.c

+27 −22
Original line number Diff line number Diff line
@@ -515,7 +515,8 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, 
        }

        else { // DATA & MANAGE Frame

            if (byFBOption == AUTO_FB_NONE) {

                PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead;

		struct vnt_tx_datahead_g *pBuf =

				(struct vnt_tx_datahead_g *)pTxDataHead;

                //Get SignalField,ServiceField,Length

                BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,

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

				sizeof(struct vnt_rrv_time_rts) + cbMICHDR);

                pvCTS = NULL;

		pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +

			sizeof(struct vnt_rrv_time_rts) + cbMICHDR +

						sizeof(struct vnt_rts_g));

		pvTxDataHd = (struct vnt_tx_datahead_g *) (pbyTxBufferAddr +

			wTxBufSize + sizeof(struct vnt_rrv_time_rts) +

				cbMICHDR + sizeof(struct vnt_rts_g));

		cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_rts) +

			cbMICHDR + sizeof(struct vnt_rts_g) +

				sizeof(STxDataHead_g);

				sizeof(struct vnt_tx_datahead_g);

            }

            else { //RTS_needless

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

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

				sizeof(struct vnt_rrv_time_cts) + cbMICHDR);

		pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +

			sizeof(struct vnt_rrv_time_cts) + cbMICHDR +

						sizeof(struct vnt_cts));

		pvTxDataHd = (struct vnt_tx_datahead_g *)(pbyTxBufferAddr +

			wTxBufSize + sizeof(struct vnt_rrv_time_cts) +

				cbMICHDR + sizeof(struct vnt_cts));

		cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_cts) +

			cbMICHDR + sizeof(struct vnt_cts) +

				sizeof(STxDataHead_g);

				sizeof(struct vnt_tx_datahead_g);

            }

        } else {

            // Auto Fall Back
@@ -1688,10 +1689,10 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 
        pvRTS = NULL;

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

					sizeof(struct vnt_rrv_time_cts));

	pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +

	pvTxDataHd = (struct vnt_tx_datahead_g *)(pbyTxBufferAddr + wTxBufSize +

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

		sizeof(struct vnt_cts) + sizeof(struct vnt_tx_datahead_g);

    }

    else { // 802.11a/b packet

	pvRrvTime = (struct vnt_rrv_time_ab *) (pbyTxBufferAddr + wTxBufSize);
@@ -1785,8 +1786,10 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 
        // in the same place of other packet's Duration-field).

        // And it will cause Cisco-AP to issue Disassociation-packet

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

            ((PSTxDataHead_g)pvTxDataHd)->wDuration_a = cpu_to_le16(pPacket->p80211Header->sA2.wDurationID);

            ((PSTxDataHead_g)pvTxDataHd)->wDuration_b = cpu_to_le16(pPacket->p80211Header->sA2.wDurationID);

		((struct vnt_tx_datahead_g *)pvTxDataHd)->wDuration_a =

			cpu_to_le16(pPacket->p80211Header->sA2.wDurationID);

		((struct vnt_tx_datahead_g *)pvTxDataHd)->wDuration_b =

			cpu_to_le16(pPacket->p80211Header->sA2.wDurationID);

	} else {

            ((PSTxDataHead_ab)pvTxDataHd)->wDuration = cpu_to_le16(pPacket->p80211Header->sA2.wDurationID);

        }
@@ -2093,11 +2096,11 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
        pvRTS = NULL;

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

			sizeof(struct vnt_rrv_time_cts) + cbMICHDR);

	pvTxDataHd = (PSTxDataHead_g) (pbyTxBufferAddr + wTxBufSize +

		sizeof(struct vnt_rrv_time_cts) + cbMICHDR +

	pvTxDataHd = (struct vnt_tx_datahead_g *) (pbyTxBufferAddr +

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

		sizeof(struct vnt_cts) + sizeof(struct vnt_tx_datahead_g);



    }

    else {//802.11a/b packet
@@ -2239,8 +2242,10 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
        // in the same place of other packet's Duration-field).

        // And it will cause Cisco-AP to issue Disassociation-packet

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

            ((PSTxDataHead_g)pvTxDataHd)->wDuration_a = cpu_to_le16(p80211Header->sA2.wDurationID);

            ((PSTxDataHead_g)pvTxDataHd)->wDuration_b = cpu_to_le16(p80211Header->sA2.wDurationID);

		((struct vnt_tx_datahead_g *)pvTxDataHd)->wDuration_a =

			cpu_to_le16(p80211Header->sA2.wDurationID);

		((struct vnt_tx_datahead_g *)pvTxDataHd)->wDuration_b =

			cpu_to_le16(p80211Header->sA2.wDurationID);

	} else {

            ((PSTxDataHead_ab)pvTxDataHd)->wDuration = cpu_to_le16(p80211Header->sA2.wDurationID);

        }

drivers/staging/vt6656/rxtx.h

+14 −0
Original line number Diff line number Diff line
@@ -54,6 +54,20 @@ struct vnt_rrv_time_ab { 
	u16 wTxRrvTime;

} __packed;



/* TX data header */

struct vnt_tx_datahead_g {

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

	u16 wTimeStampOff_a;

} __packed;



/* RTS buffer header */

struct vnt_rts_g {

	u8 bySignalField_b;