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

Commit 8a10a546 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt28x0: remove typedefs (part two) 



Remove typedefs from rt_linux.h and rtmp_usb.h.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 51126deb

drivers/staging/rt2860/chip/mac_usb.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ typedef struct _RX_CONTEXT { 
	BOOLEAN Readable;	/* Receive Complete back. OK for driver to indicate receiving packet. */

	BOOLEAN IRPPending;	/* TODO: To be removed */

	atomic_t IrpLock;

	NDIS_SPIN_LOCK RxContextLock;

	spinlock_t RxContextLock;

	dma_addr_t data_dma;	/* urb dma on linux */

} RX_CONTEXT, *PRX_CONTEXT;

drivers/staging/rt2860/common/ba_action.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ void BA_MaxWinSizeReasign(IN PRTMP_ADAPTER pAd, 
void Announce_Reordering_Packet(IN PRTMP_ADAPTER pAd,

				IN struct reordering_mpdu *mpdu)

{

	PNDIS_PACKET pPacket;

	void *pPacket;



	pPacket = mpdu->pPacket;
@@ -1388,7 +1388,7 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(IN PRTMP_ADAPTER pAd, 
							   u8

							   FromWhichBSSID)

{

	PNDIS_PACKET pRxPkt;

	void *pRxPkt;

	u8 Header802_3[LENGTH_802_3];



	/* 1. get 802.3 Header */

drivers/staging/rt2860/common/cmm_data.c

+20 −20
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ QID_AC_VO, QID_AC_VO }; 
int MiniportMMRequest(IN PRTMP_ADAPTER pAd,

			      u8 QueIdx, u8 *pData, u32 Length)

{

	PNDIS_PACKET pPacket;

	void *pPacket;

	int Status = NDIS_STATUS_SUCCESS;

	unsigned long FreeNum;

	u8 rtmpHwHdr[TXINFO_SIZE + TXWI_SIZE];	/*RTMP_HW_HDR_LEN]; */
@@ -243,7 +243,7 @@ int MiniportMMRequest(IN PRTMP_ADAPTER pAd, 
	========================================================================

*/

int MlmeHardTransmit(IN PRTMP_ADAPTER pAd,

			     u8 QueIdx, IN PNDIS_PACKET pPacket)

			     u8 QueIdx, void *pPacket)

{

	PACKET_INFO PacketInfo;

	u8 *pSrcBufVA;
@@ -271,7 +271,7 @@ int MlmeHardTransmit(IN PRTMP_ADAPTER pAd, 
}



int MlmeHardTransmitMgmtRing(IN PRTMP_ADAPTER pAd,

				     u8 QueIdx, IN PNDIS_PACKET pPacket)

				     u8 QueIdx, void *pPacket)

{

	PACKET_INFO PacketInfo;

	u8 *pSrcBufVA;
@@ -506,7 +506,7 @@ int MlmeHardTransmitMgmtRing(IN PRTMP_ADAPTER pAd, 
								(2).Normal

	========================================================================

*/

static u8 TxPktClassification(IN RTMP_ADAPTER * pAd, IN PNDIS_PACKET pPacket)

static u8 TxPktClassification(IN RTMP_ADAPTER * pAd, void *pPacket)

{

	u8 TxFrameType = TX_UNKOWN_FRAME;

	u8 Wcid;
@@ -557,7 +557,7 @@ static u8 TxPktClassification(IN RTMP_ADAPTER * pAd, IN PNDIS_PACKET pPacket) 
BOOLEAN RTMP_FillTxBlkInfo(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk)

{

	PACKET_INFO PacketInfo;

	PNDIS_PACKET pPacket;

	void *pPacket;

	PMAC_TABLE_ENTRY pMacEntry = NULL;



	pPacket = pTxBlk->pPacket;
@@ -663,7 +663,7 @@ BOOLEAN RTMP_FillTxBlkInfo(IN RTMP_ADAPTER * pAd, IN TX_BLK * pTxBlk) 
}



BOOLEAN CanDoAggregateTransmit(IN RTMP_ADAPTER * pAd,

			       IN NDIS_PACKET * pPacket, IN TX_BLK * pTxBlk)

			       char * pPacket, IN TX_BLK * pTxBlk)

{



	/*DBGPRINT(RT_DEBUG_TRACE, ("Check if can do aggregation! TxFrameType=%d!\n", pTxBlk->TxFrameType)); */
@@ -716,7 +716,7 @@ void RTMPDeQueuePacket(IN PRTMP_ADAPTER pAd, IN BOOLEAN bIntContext, u8 QIdx, /* 
		       u8 Max_Tx_Packets)

{

	PQUEUE_ENTRY pEntry = NULL;

	PNDIS_PACKET pPacket;

	void *pPacket;

	int Status = NDIS_STATUS_SUCCESS;

	u8 Count = 0;

	PQUEUE_HEADER pQueue;
@@ -1380,7 +1380,7 @@ void RTMPResumeMsduTransmission(IN PRTMP_ADAPTER pAd) 
}



u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd,

				PNDIS_PACKET pPacket,

				void *pPacket,

				u8 *pData, unsigned long DataSize)

{

	u16 PayloadSize;
@@ -1390,7 +1390,7 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd, 
	u8 Header802_3[14];



	u8 *pPayload, *pDA, *pSA, *pRemovedLLCSNAP;

	PNDIS_PACKET pClonePacket;

	void *pClonePacket;



	nMSDU = 0;
@@ -1479,7 +1479,7 @@ u32 deaggregate_AMSDU_announce(IN PRTMP_ADAPTER pAd, 
	return nMSDU;

}



u32 BA_Reorder_AMSDU_Annnounce(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)

u32 BA_Reorder_AMSDU_Annnounce(IN PRTMP_ADAPTER pAd, void *pPacket)

{

	u8 *pData;

	u16 DataSize;
@@ -1853,7 +1853,7 @@ void DisassocParmFill(IN PRTMP_ADAPTER pAd, 
	========================================================================

*/



BOOLEAN RTMPCheckDHCPFrame(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)

BOOLEAN RTMPCheckDHCPFrame(IN PRTMP_ADAPTER pAd, void *pPacket)

{

	PACKET_INFO PacketInfo;

	unsigned long NumberOfBytesRead = 0;
@@ -1908,7 +1908,7 @@ BOOLEAN RTMPCheckDHCPFrame(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket) 
	return TRUE;

}



BOOLEAN RTMPCheckEtherType(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket)

BOOLEAN RTMPCheckEtherType(IN PRTMP_ADAPTER pAd, void *pPacket)

{

	u16 TypeLen;

	u8 Byte0, Byte1;
@@ -1938,7 +1938,7 @@ BOOLEAN RTMPCheckEtherType(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket) 
		 */

		if (pSrcBuf[0] == 0xAA && pSrcBuf[1] == 0xAA

		    && pSrcBuf[2] == 0x03) {

			Sniff2BytesFromNdisBuffer((PNDIS_BUFFER) pSrcBuf, 6,

			Sniff2BytesFromNdisBuffer((char *)pSrcBuf, 6,

						  &Byte0, &Byte1);

			RTMP_SET_PACKET_LLCSNAP(pPacket, 1);

			TypeLen = (u16)((Byte0 << 8) + Byte1);
@@ -1961,7 +1961,7 @@ BOOLEAN RTMPCheckEtherType(IN PRTMP_ADAPTER pAd, IN PNDIS_PACKET pPacket) 
		   Frame Check Sequence (4-bytes) */



		RTMP_SET_PACKET_VLAN(pPacket, 1);

		Sniff2BytesFromNdisBuffer((PNDIS_BUFFER) pSrcBuf, 2, &Byte0,

		Sniff2BytesFromNdisBuffer((char *)pSrcBuf, 2, &Byte0,

					  &Byte1);

		TypeLen = (u16)((Byte0 << 8) + Byte1);
@@ -2043,7 +2043,7 @@ void Update_Rssi_Sample(IN PRTMP_ADAPTER pAd, 
void Indicate_Legacy_Packet(IN PRTMP_ADAPTER pAd,

			    IN RX_BLK * pRxBlk, u8 FromWhichBSSID)

{

	PNDIS_PACKET pRxPacket = pRxBlk->pRxPacket;

	void *pRxPacket = pRxBlk->pRxPacket;

	u8 Header802_3[LENGTH_802_3];



	/* 1. get 802.3 Header */
@@ -2135,7 +2135,7 @@ void CmmRxRalinkFrameIndicate(IN PRTMP_ADAPTER pAd, 
	u16 Msdu2Size;

	u16 Payload1Size, Payload2Size;

	u8 *pData2;

	PNDIS_PACKET pPacket2 = NULL;

	void *pPacket2 = NULL;



	Msdu2Size = *(pRxBlk->pData) + (*(pRxBlk->pData + 1) << 8);
@@ -2192,13 +2192,13 @@ void CmmRxRalinkFrameIndicate(IN PRTMP_ADAPTER pAd, 
		_fragFrame.Flags = 0;		\

	}



PNDIS_PACKET RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)

void *RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk)

{

	PHEADER_802_11 pHeader = pRxBlk->pHeader;

	PNDIS_PACKET pRxPacket = pRxBlk->pRxPacket;

	void *pRxPacket = pRxBlk->pRxPacket;

	u8 *pData = pRxBlk->pData;

	u16 DataSize = pRxBlk->DataSize;

	PNDIS_PACKET pRetPacket = NULL;

	void *pRetPacket = NULL;

	u8 *pFragBuffer = NULL;

	BOOLEAN bReassDone = FALSE;

	u8 HeaderRoom = 0;
@@ -2273,7 +2273,7 @@ PNDIS_PACKET RTMPDeFragmentDataFrame(IN PRTMP_ADAPTER pAd, IN RX_BLK * pRxBlk) 
	/* return defragmented packet if packet is reassembled completely */

	/* otherwise return NULL */

	if (bReassDone) {

		PNDIS_PACKET pNewFragPacket;

		void *pNewFragPacket;



		/* allocate a new packet buffer for fragment */

		pNewFragPacket =

drivers/staging/rt2860/common/cmm_data_pci.c

+10 −10
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ u16 RtmpPCI_WriteFragTxResource(IN PRTMP_ADAPTER pAd, 
 */

int RtmpPCIMgmtKickOut(IN RTMP_ADAPTER * pAd,

		       u8 QueIdx,

		       IN PNDIS_PACKET pPacket,

		       void *pPacket,

		       u8 *pSrcBufVA, u32 SrcBufLen)

{

	PTXD_STRUC pTxD;
@@ -520,7 +520,7 @@ BOOLEAN RTMPFreeTXDUponTxDmaDone(IN PRTMP_ADAPTER pAd, u8 QueIdx) 
{

	PRTMP_TX_RING pTxRing;

	PTXD_STRUC pTxD;

	PNDIS_PACKET pPacket;

	void *pPacket;

	u8 FREE = 0;

	TXD_STRUC TxD, *pOriTxD;

	/*unsigned long         IrqFlags; */
@@ -664,7 +664,7 @@ BOOLEAN RTMPHandleTxRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd, 
void RTMPHandleMgmtRingDmaDoneInterrupt(IN PRTMP_ADAPTER pAd)

{

	PTXD_STRUC pTxD;

	PNDIS_PACKET pPacket;

	void *pPacket;

/*      int              i; */

	u8 FREE = 0;

	PRTMP_MGMT_RING pMgmtRing = &pAd->MgmtRing;
@@ -773,16 +773,16 @@ void RTMPHandleRxCoherentInterrupt(IN PRTMP_ADAPTER pAd) 
	DBGPRINT(RT_DEBUG_TRACE, ("<== RTMPHandleRxCoherentInterrupt \n"));

}



PNDIS_PACKET GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,

void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,

				 OUT PRT28XX_RXD_STRUC pSaveRxD,

				 OUT BOOLEAN * pbReschedule,

				 IN u32 * pRxPending)

{

	PRXD_STRUC pRxD;

	PNDIS_PACKET pRxPacket = NULL;

	PNDIS_PACKET pNewPacket;

	void *pRxPacket = NULL;

	void *pNewPacket;

	void *AllocVa;

	NDIS_PHYSICAL_ADDRESS AllocPa;

	dma_addr_t AllocPa;

	BOOLEAN bReschedule = FALSE;

	RTMP_DMACB *pRxCell;
@@ -834,7 +834,7 @@ PNDIS_PACKET GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, 
		pRxPacket = pRxCell->pNdisPacket;



		pRxCell->DmaBuf.AllocSize = RX_BUFFER_AGGRESIZE;

		pRxCell->pNdisPacket = (PNDIS_PACKET) pNewPacket;

		pRxCell->pNdisPacket = (void *)pNewPacket;

		pRxCell->DmaBuf.AllocVa = AllocVa;

		pRxCell->DmaBuf.AllocPa = AllocPa;

		/* update SDP0 to new buffer of rx packet */
@@ -865,7 +865,7 @@ PNDIS_PACKET GetPacketFromRxRing(IN PRTMP_ADAPTER pAd, 
}



int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd,

				   u8 QueIdx, IN PNDIS_PACKET pPacket)

				   u8 QueIdx, void *pPacket)

{

	PACKET_INFO PacketInfo;

	u8 *pSrcBufVA;
@@ -1041,7 +1041,7 @@ int MlmeHardTransmitTxRing(IN PRTMP_ADAPTER pAd, 
}



int MlmeDataHardTransmit(IN PRTMP_ADAPTER pAd,

				 u8 QueIdx, IN PNDIS_PACKET pPacket)

				 u8 QueIdx, void *pPacket)

{

	if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)

	    ) {

drivers/staging/rt2860/common/cmm_data_usb.c

+3 −3
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ void RtmpUSBDataKickOut(IN PRTMP_ADAPTER pAd, 
 */

int RtmpUSBMgmtKickOut(IN RTMP_ADAPTER * pAd,

		       u8 QueIdx,

		       IN PNDIS_PACKET pPacket,

		       void *pPacket,

		       u8 *pSrcBufVA, u32 SrcBufLen)

{

	PTXINFO_STRUC pTxInfo;
@@ -707,13 +707,13 @@ Return Value: 
Note:

========================================================================

*/

PNDIS_PACKET GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,

void *GetPacketFromRxRing(IN PRTMP_ADAPTER pAd,

				 OUT PRT28XX_RXD_STRUC pSaveRxD,

				 OUT BOOLEAN * pbReschedule,

				 IN u32 * pRxPending)

{

	PRX_CONTEXT pRxContext;

	PNDIS_PACKET pSkb;

	void *pSkb;

	u8 *pData;

	unsigned long ThisFrameLen;

	unsigned long RxBufferLength;