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

Commit 9587b092 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: replace typedef struct tagSRTS_g_FB with struct vnt_rts_g_fb 



Replacing members
b, a, wDuration_ba, wDuration_aa, wDuration_bb, wReserved, wRTSDuration_ba_f0,
wRTSDuration_aa_f0, wRTSDuration_ba_f1, wRTSDuration_aa_f1 and data

with

b, a, duration_ba, duration_aa, duration_bb, wReserved, rts_duration_ba_f0,
rts_duration_aa_f0, rts_duration_ba_f1, rts_duration_aa_f1 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 17434f09

drivers/staging/vt6655/desc.h

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

};



typedef struct tagSRTS_g_FB {

	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;

	unsigned short wRTSDuration_ba_f0;

	unsigned short wRTSDuration_aa_f0;

	unsigned short wRTSDuration_ba_f1;

	unsigned short wRTSDuration_aa_f1;

	struct ieee80211_rts data;

} __attribute__ ((__packed__))

SRTS_g_FB, *PSRTS_g_FB;

typedef const SRTS_g_FB *PCSRTS_g_FB;



typedef struct tagSRTS_ab {

	struct vnt_phy_field ab;

	unsigned short wDuration;

drivers/staging/vt6655/rxtx.c

+42 −20
Original line number Diff line number Diff line
@@ -860,41 +860,62 @@ s_vFillRTSHead( 
				memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);



		} else {

			PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS;

			struct vnt_rts_g_fb *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 OFDMData

			pBuf->wRTSDuration_ba_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption));    //4:wRTSDuration_ba_f0, 1:2.4G, 1:CCKData

			pBuf->wRTSDuration_aa_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption));    //5:wRTSDuration_aa_f0, 1:2.4G, 1:CCKData

			pBuf->wRTSDuration_ba_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption));    //6:wRTSDuration_ba_f1, 1:2.4G, 1:CCKData

			pBuf->wRTSDuration_aa_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption));    //7:wRTSDuration_aa_f1, 1:2.4G, 1:CCKData

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

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

			buf->rts_duration_ba_f0 =

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

								      byPktType, wCurrentRate, bNeedAck,

								      byFBOption));

			buf->rts_duration_aa_f0 =

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

								      byPktType, wCurrentRate, bNeedAck,

								      byFBOption));

			buf->rts_duration_ba_f1 =

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

								      byPktType, wCurrentRate, bNeedAck,

								      byFBOption));

			buf->rts_duration_aa_f1 =

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

								      byPktType, wCurrentRate, bNeedAck,

								      byFBOption));

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



		} // if (byFBOption == AUTO_FB_NONE)

	} else if (byPktType == PK_TYPE_11A) {
@@ -1365,11 +1386,12 @@ 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_FB) (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_FB));

				pvTxDataHd = (void *)(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(SRTS_g_FB) + sizeof(struct vnt_tx_datahead_g_fb);

					cbMICHDR + sizeof(struct vnt_rts_g_fb) + sizeof(struct vnt_tx_datahead_g_fb);

			} 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

+14 −0
Original line number Diff line number Diff line
@@ -124,6 +124,20 @@ struct vnt_rts_g { 
	struct ieee80211_rts data;

} __packed;



struct vnt_rts_g_fb {

	struct vnt_phy_field b;

	struct vnt_phy_field a;

	__le16 duration_ba;

	__le16 duration_aa;

	__le16 duration_bb;

	u16 wReserved;

	__le16 rts_duration_ba_f0;

	__le16 rts_duration_aa_f0;

	__le16 rts_duration_ba_f1;

	__le16 rts_duration_aa_f1;

	struct ieee80211_rts data;

} __packed;



struct vnt_tx_short_buf_head {

	__le16 fifo_ctl;

	u16 time_stamp;