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

Commit 8e44804e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: replace typedef struct tagSRTS_a_FB with struct vnt_rts_a_fb 



Replacing members
a, wDuration, wReserved, wRTSDuration_f0, wRTSDuration_f1 and data
with
a, duration, reserved, rts_duration_f0, rts_duration_f1 and data

unsigned short is replaced with u16 or __le16 where necessary.

cast void pointer to pvRTS

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 e21eb1c8

drivers/staging/vt6655/desc.h

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

	u32 field_write;

};

};





typedef struct tagSRTS_a_FB {

	struct vnt_phy_field a;

	unsigned short wDuration;

	unsigned short wReserved;

	unsigned short wRTSDuration_f0;

	unsigned short wRTSDuration_f1;

	struct ieee80211_rts data;

} __attribute__ ((__packed__))

SRTS_a_FB, *PSRTS_a_FB;

typedef const SRTS_a_FB *PCSRTS_a_FB;



//

//

// CTS buffer header

// CTS buffer header

//

//

drivers/staging/vt6655/rxtx.c

+25 −16
Original line number Original line Diff line number Diff line
@@ -950,32 +950,40 @@ s_vFillRTSHead( 
				memcpy(&buf->data.ta, psEthHeader->abySrcAddr, ETH_ALEN);

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





		} else {

		} else {

			PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS;

			struct vnt_rts_a_fb *buf = pvRTS;

			/* Get SignalField, ServiceField & Length */

			/* Get SignalField, ServiceField & Length */

			vnt_get_phy_field(pDevice, uRTSFrameLen,

			vnt_get_phy_field(pDevice, uRTSFrameLen,

					  pDevice->byTopOFDMBasicRate,

					  pDevice->byTopOFDMBasicRate,

					  byPktType, &pBuf->a);

					  byPktType, &buf->a);

			//Get Duration

			/* Get Duration */

			pBuf->wDuration = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData

			buf->duration =

			pBuf->wRTSDuration_f0 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData

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

			pBuf->wRTSDuration_f1 = cpu_to_le16((unsigned short)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:RTSDuration_aa_f1, 0:5G, 0:

								      byPktType, wCurrentRate,

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

								      bNeedAck, byFBOption));

			buf->rts_duration_f0 =

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

								      byPktType, wCurrentRate,

								      bNeedAck, byFBOption));

			buf->rts_duration_f1 =

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

								      byPktType, wCurrentRate,

								      bNeedAck, byFBOption));

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

			/* Get RTS Frame body */

			/* Get RTS Frame body */

			pBuf->data.frame_control =

			buf->data.frame_control =

					cpu_to_le16(IEEE80211_FTYPE_CTL |

					cpu_to_le16(IEEE80211_FTYPE_CTL |

						    IEEE80211_STYPE_RTS);

						    IEEE80211_STYPE_RTS);







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

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

			    (pDevice->eOPMode == OP_MODE_AP)) {

			    (pDevice->eOPMode == OP_MODE_AP)) {

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

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

			} else {

			} else {

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

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

			}

			}

			if (pDevice->eOPMode == OP_MODE_AP)

			if (pDevice->eOPMode == OP_MODE_AP)

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

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

			else

			else

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

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

		}

		}

	} else if (byPktType == PK_TYPE_11B) {

	} else if (byPktType == PK_TYPE_11B) {

		struct vnt_rts_ab *buf = pvRTS;

		struct vnt_rts_ab *buf = pvRTS;
@@ -1434,11 +1442,12 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, 
			if (bRTS == true) {//RTS_need

			if (bRTS == true) {//RTS_need

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

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

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

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

				pvRTS = (PSRTS_a_FB) (pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR);

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

				pvCTS = NULL;

				pvCTS = NULL;

				pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab) + cbMICHDR + sizeof(SRTS_a_FB));

				pvTxDataHd = (void *)(pbyTxBufferAddr + wTxBufSize +

					sizeof(struct vnt_rrv_time_ab) + cbMICHDR + sizeof(struct vnt_rts_a_fb));

				cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +

				cbHeaderLength = wTxBufSize + sizeof(struct vnt_rrv_time_ab) +

					cbMICHDR + sizeof(SRTS_a_FB) + sizeof(struct vnt_tx_datahead_a_fb);

					cbMICHDR + sizeof(struct vnt_rts_a_fb) + sizeof(struct vnt_tx_datahead_a_fb);

			} else { //RTS_needless

			} else { //RTS_needless

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

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

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

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

drivers/staging/vt6655/rxtx.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -145,6 +145,15 @@ struct vnt_rts_ab { 
	struct ieee80211_rts data;

	struct ieee80211_rts data;

} __packed;

} __packed;





struct vnt_rts_a_fb {

	struct vnt_phy_field a;

	__le16 duration;

	u16 reserved;

	__le16 rts_duration_f0;

	__le16 rts_duration_f1;

	struct ieee80211_rts data;

} __packed;



struct vnt_tx_short_buf_head {

struct vnt_tx_short_buf_head {

	__le16 fifo_ctl;

	__le16 fifo_ctl;

	u16 time_stamp;

	u16 time_stamp;