Commit 2bc1c810 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt3070: remove dead RT_BIG_ENDIAN code 



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

drivers/staging/rt3070/2870_main_dev.c

+1 −3
Original line number Diff line number Diff line
@@ -1264,9 +1264,7 @@ VOID RT28xx_UpdateBeaconToAsic( 
	else

	{

		ptr = (PUCHAR)&pAd->BeaconTxWI;

#ifdef RT_BIG_ENDIAN

		RTMPWIEndianChange(ptr, TYPE_TXWI);

#endif



		if (NdisEqualMemory(pBeaconSync->BeaconTxWI[bcn_idx], &pAd->BeaconTxWI, TXWI_SIZE) == FALSE)

		{	// If BeaconTxWI changed, we need to rewrite the TxWI for the Beacon frames.

			pBeaconSync->BeaconBitMap &= (~(BEACON_BITMAP_MASK & (1 << bcn_idx)));

drivers/staging/rt3070/action.h

+0 −7
Original line number Diff line number Diff line
@@ -41,17 +41,10 @@ 


typedef struct PACKED __HT_INFO_OCTET

{

#ifdef RT_BIG_ENDIAN

	UCHAR	Reserved:5;

	UCHAR 	STA_Channel_Width:1;

	UCHAR	Forty_MHz_Intolerant:1;

	UCHAR	Request:1;

#else

	UCHAR	Request:1;

	UCHAR	Forty_MHz_Intolerant:1;

	UCHAR 	STA_Channel_Width:1;

	UCHAR	Reserved:5;

#endif

} HT_INFORMATION_OCTET;

drivers/staging/rt3070/common/2870_rtmp_init.c

+1 −9
Original line number Diff line number Diff line
@@ -1063,18 +1063,13 @@ PNDIS_PACKET GetPacketFromRxRing( 
	// skip USB frame length field

	pData += RT2870_RXDMALEN_FIELD_SIZE;

	pRxWI = (PRXWI_STRUC)pData;

#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange(pData, TYPE_RXWI);

#endif // RT_BIG_ENDIAN //



	if (pRxWI->MPDUtotalByteCount > ThisFrameLen)

	{

		DBGPRINT(RT_DEBUG_ERROR, ("%s():pRxWIMPDUtotalByteCount(%d) large than RxDMALen(%ld)\n",

									__func__, pRxWI->MPDUtotalByteCount, ThisFrameLen));

		goto label_null;

	}

#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange(pData, TYPE_RXWI);

#endif // RT_BIG_ENDIAN //



	// allocate a rx packet

	pSkb = dev_alloc_skb(ThisFrameLen);
@@ -1091,9 +1086,6 @@ PNDIS_PACKET GetPacketFromRxRing( 


	// copy RxD

	*pSaveRxD = *(PRXINFO_STRUC)(pData + ThisFrameLen);

#ifdef RT_BIG_ENDIAN

	RTMPDescriptorEndianChange((PUCHAR)pSaveRxD, TYPE_RXINFO);

#endif // RT_BIG_ENDIAN //



	// update next packet read position.

	pAd->ReadPosition += (ThisFrameLen + RT2870_RXDMALEN_FIELD_SIZE + RXINFO_SIZE);	// 8 for (RT2870_RXDMALEN_FIELD_SIZE + sizeof(RXINFO_STRUC))

drivers/staging/rt3070/common/cmm_data.c

+0 −8
Original line number Diff line number Diff line
@@ -495,10 +495,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
		return (NDIS_STATUS_FAILURE);

	}



#ifdef RT_BIG_ENDIAN

	RTMPFrameEndianChange(pAd, (PUCHAR)pHeader_802_11, DIR_WRITE, FALSE);

#endif



	//

	// fill scatter-and-gather buffer list into TXD. Internally created NDIS PACKET

	// should always has only one ohysical buffer, and the whole frame size equals
@@ -526,10 +522,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
					IFS_BACKOFF, FALSE, &pMacEntry->MaxHTPhyMode);

	}



#ifdef RT_BIG_ENDIAN

	RTMPWIEndianChange((PUCHAR)pFirstTxWI, TYPE_TXWI);

#endif



	// Now do hardware-depened kick out.

	HAL_KickOutMgmtTx(pAd, QueIdx, pPacket, pSrcBufVA, SrcBufLen);

drivers/staging/rt3070/common/cmm_data_2870.c

+0 −16
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ USHORT RtmpUSB_WriteFragTxResource( 
	}



	NdisMoveMemory(pWirelessPacket, pTxBlk->HeaderBuf, TXINFO_SIZE + TXWI_SIZE + hwHdrLen);

#ifdef RT_BIG_ENDIAN

	RTMPFrameEndianChange(pAd, (PUCHAR)(pWirelessPacket + TXINFO_SIZE + TXWI_SIZE), DIR_WRITE, FALSE);

#endif // RT_BIG_ENDIAN //

	pWirelessPacket += (TXINFO_SIZE + TXWI_SIZE + hwHdrLen);

	pHTTXContext->CurWriteRealPos += (TXINFO_SIZE + TXWI_SIZE + hwHdrLen);
@@ -307,9 +304,6 @@ USHORT RtmpUSB_WriteSingleTxResource( 
			bTxQLastRound = TRUE;

		}

		NdisMoveMemory(pWirelessPacket, pTxBlk->HeaderBuf, TXINFO_SIZE + TXWI_SIZE + hwHdrLen);

#ifdef RT_BIG_ENDIAN

		RTMPFrameEndianChange(pAd, (PUCHAR)(pWirelessPacket + TXINFO_SIZE + TXWI_SIZE), DIR_WRITE, FALSE);

#endif // RT_BIG_ENDIAN //

		pWirelessPacket += (TXINFO_SIZE + TXWI_SIZE + hwHdrLen);



		// We unlock it here to prevent the first 8 bytes maybe over-writed issue.
@@ -421,9 +415,6 @@ USHORT RtmpUSB_WriteMultiTxResource( 


			// Copy it.

			NdisMoveMemory(pWirelessPacket, pTxBlk->HeaderBuf, pTxBlk->Priv);

#ifdef RT_BIG_ENDIAN

			RTMPFrameEndianChange(pAd, (PUCHAR)(pWirelessPacket+ TXINFO_SIZE + TXWI_SIZE), DIR_WRITE, FALSE);

#endif // RT_BIG_ENDIAN //

			pHTTXContext->CurWriteRealPos += pTxBlk->Priv;

			pWirelessPacket += pTxBlk->Priv;

		}
@@ -691,14 +682,7 @@ VOID RtmpUSBNullFrameKickOut( 
		pTxWI = (PTXWI_STRUC)&pWirelessPkt[TXINFO_SIZE];

		RTMPWriteTxWI(pAd, pTxWI,  FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, 0, BSSID_WCID, (sizeof(HEADER_802_11)),

			0, 0, (UCHAR)pAd->CommonCfg.MlmeTransmit.field.MCS, IFS_HTTXOP, FALSE, &pAd->CommonCfg.MlmeTransmit);

#ifdef RT_BIG_ENDIAN

		RTMPWIEndianChange((PUCHAR)pTxWI, TYPE_TXWI);

#endif // RT_BIG_ENDIAN //



		RTMPMoveMemory(&pWirelessPkt[TXWI_SIZE+TXINFO_SIZE], &pAd->NullFrame, sizeof(HEADER_802_11));

#ifdef RT_BIG_ENDIAN

		RTMPFrameEndianChange(pAd, (PUCHAR)&pWirelessPkt[TXINFO_SIZE + TXWI_SIZE], DIR_WRITE, FALSE);

#endif // RT_BIG_ENDIAN //

		pAd->NullContext.BulkOutSize =  TXINFO_SIZE + TXWI_SIZE + sizeof(pAd->NullFrame) + 4;



		// Fill out frame length information for global Bulk out arbitor