Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17434f09 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: replace typedef struct tagSRTS_g with struct vnt_rts_g 



Replacing members
b, a, wDuration_ba, wDuration_aa, wDuration_bb, wReserved and data
with
b, a,duration_ba, duration_aa, duration_bb, reserved and  data

replacing unsigned short with u16 or __le16 where endian correction is necessary.

Creating the new structure in rxtx.h

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

drivers/staging/vt6655/desc.h

+0 −12
Original line number Diff line number Diff line
@@ -352,18 +352,6 @@ union vnt_phy_field_swap { 
	u32 field_write;

};



typedef struct tagSRTS_g {

	struct vnt_phy_field b;

	struct vnt_phy_field a;

	unsigned short wDuration_ba;

	unsigned short wDuration_aa;

	unsigned short wDuration_bb;

	unsigned short wReserved;

	struct ieee80211_rts data;

} __attribute__ ((__packed__))

SRTS_g, *PSRTS_g;

typedef const SRTS_g *PCSRTS_g;



typedef struct tagSRTS_g_FB {

	struct vnt_phy_field b;

	struct vnt_phy_field a;

drivers/staging/vt6655/rxtx.c

+28 −17
Original line number Diff line number Diff line
@@ -818,37 +818,46 @@ s_vFillRTSHead( 
	//       Otherwise, we need to modify codes for them.

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

		if (byFBOption == AUTO_FB_NONE) {

			PSRTS_g pBuf = (PSRTS_g)pvRTS;

			struct vnt_rts_g *buf = pvRTS;

			/* Get SignalField, ServiceField & Length */

			vnt_get_phy_field(pDevice, uRTSFrameLen,

					  pDevice->byTopCCKBasicRate,

					  PK_TYPE_11B, &pBuf->b);

					  PK_TYPE_11B, &buf->b);



			vnt_get_phy_field(pDevice, uRTSFrameLen,

					  pDevice->byTopOFDMBasicRate,

					  byPktType, &pBuf->a);

			//Get Duration

			pBuf->wDuration_bb = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption));    //0:RTSDuration_bb, 1:2.4G, 1:CCKData

			pBuf->wDuration_aa = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData

			pBuf->wDuration_ba = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data

					  byPktType, &buf->a);

			/* Get Duration */

			buf->duration_bb =

				cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength,

								      PK_TYPE_11B, pDevice->byTopCCKBasicRate,

								      bNeedAck, byFBOption));

			buf->duration_aa =

				cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength,

								      byPktType, wCurrentRate, bNeedAck,

								      byFBOption));

			buf->duration_ba =

				cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength,

								      byPktType, wCurrentRate, bNeedAck,

								      byFBOption));



			pBuf->data.duration = pBuf->wDuration_aa;

			buf->data.duration = buf->duration_aa;

			/* Get RTS Frame body */

			pBuf->data.frame_control =

			buf->data.frame_control =

					cpu_to_le16(IEEE80211_FTYPE_CTL |

						    IEEE80211_STYPE_RTS);





			if ((pDevice->eOPMode == OP_MODE_ADHOC) ||

			    (pDevice->eOPMode == OP_MODE_AP)) {

				memcpy(&pBuf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN);

				memcpy(&buf->data.ra, psEthHeader->abyDstAddr, ETH_ALEN);

			} else {

				memcpy(&pBuf->data.ra, pDevice->abyBSSID, ETH_ALEN);

				memcpy(&buf->data.ra, pDevice->abyBSSID, ETH_ALEN);

			}

			if (pDevice->eOPMode == OP_MODE_AP)

				memcpy(&pBuf->data.ta, pDevice->abyBSSID, ETH_ALEN);

				memcpy(&buf->data.ta, pDevice->abyBSSID, ETH_ALEN);

			else

				memcpy(&pBuf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);

				memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);



		} else {

			PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS;
@@ -1335,11 +1344,13 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, 
			if (bRTS == true) {//RTS_need

				pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);

				pMICHDR = (struct vnt_mic_hdr *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts));

				pvRTS = (PSRTS_g)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) + cbMICHDR);

				pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) + cbMICHDR);

				pvCTS = NULL;

				pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) + cbMICHDR + sizeof(SRTS_g));

				pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts) +

							cbMICHDR + sizeof(struct vnt_rts_g));

				cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_rts) +

							cbMICHDR + sizeof(SRTS_g) + sizeof(struct vnt_tx_datahead_g);

							cbMICHDR + sizeof(struct vnt_rts_g) +

							sizeof(struct vnt_tx_datahead_g);

			} else { //RTS_needless

				pvRrvTime = (void *)(pbyTxBufferAddr + wTxBufSize);

				pMICHDR = (struct vnt_mic_hdr *) (pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_cts));

drivers/staging/vt6655/rxtx.h

+11 −0
Original line number Diff line number Diff line
@@ -113,6 +113,17 @@ struct vnt_tx_datahead_a_fb { 
	__le16 duration_f1;

} __packed;



/* RTS buffer header */

struct vnt_rts_g {

	struct vnt_phy_field b;

	struct vnt_phy_field a;

	__le16 duration_ba;

	__le16 duration_aa;

	__le16 duration_bb;

	u16 reserved;

	struct ieee80211_rts data;

} __packed;



struct vnt_tx_short_buf_head {

	__le16 fifo_ctl;

	u16 time_stamp;