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

Commit 303ee97d authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt2870: remove dead CONFIG_AP_SUPPORT code 



Then remove no longer needed IF_DEV_CONFIG_OPMODE_ON_[AP,STA]() macros.

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

drivers/staging/rt2870/2870_main_dev.c

+2 −8
Original line number Diff line number Diff line
@@ -1279,10 +1279,7 @@ VOID RT2870_BssBeaconStop( 
	{

		INT NumOfBcn;



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

		NumOfBcn = MAX_MESH_NUM;

		}



		RTMPCancelTimer(&pAd->CommonCfg.BeaconUpdateTimer, &Cancelled);
@@ -1315,10 +1312,7 @@ VOID RT2870_BssBeaconStart( 
	{

		INT NumOfBcn;



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

		NumOfBcn = MAX_MESH_NUM;

		}



		for(apidx=0; apidx<NumOfBcn; apidx++)

		{

drivers/staging/rt2870/common/action.c

+2 −7
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ VOID MlmeADDBAAction( 
			pBAEntry =&pAd->BATable.BAOriEntry[Idx];

		}



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

			if (ADHOC_ON(pAd))

				ActHeaderInit(pAd, &Frame.Hdr, pInfo->pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -207,7 +206,6 @@ VOID MlmeDELBAAction( 
		// SEND BAR (Send BAR to refresh peer reordering buffer.)

		Idx = pAd->MacTab.Content[pInfo->Wcid].BAOriWcidArray[pInfo->TID];



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress);



		FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL funciton.
@@ -227,7 +225,6 @@ VOID MlmeDELBAAction( 
		// SEND DELBA FRAME

		FrameLen = 0;



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

			if (ADHOC_ON(pAd))

				ActHeaderInit(pAd, &Frame.Hdr, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -357,7 +354,6 @@ static VOID respond_ht_information_exchange_action( 


	NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO));

	// 2-1. Prepare ADDBA Response frame.

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		if (ADHOC_ON(pAd))

			ActHeaderInit(pAd, &HTINFOframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -530,7 +526,6 @@ VOID SendRefreshBAR( 


			Sequence = pEntry->TxSeq[TID];



			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			BarHeaderInit(pAd, &FrameBar, pEntry->Addr, pAd->CurrentAddress);



			FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function.

drivers/staging/rt2870/common/ba_action.c

+8 −19
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ void Announce_Reordering_Packet(IN PRTMP_ADAPTER pAd, 
		// pass this 802.3 packet to upper layer or forward this packet to WM directly

		//



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket, RTMP_GET_PACKET_IF(pPacket));

	}

}
@@ -602,7 +601,6 @@ VOID BAOriSessionAdd( 
			return;

		}



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pBAEntry->Wcid].Addr, pAd->CurrentAddress);



		FrameBar.StartingSeq.field.FragNum = 0;	// make sure sequence not clear in DEL function.
@@ -1072,12 +1070,9 @@ VOID BAOriSessionSetupTimeout( 


	pAd = pBAEntry->pAdapter;



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

	// Do nothing if monitor mode is on

	if (MONITOR_ON(pAd))

		return;

	}



	pEntry = &pAd->MacTab.Content[pBAEntry->Wcid];
@@ -1212,7 +1207,6 @@ VOID PeerAddBAReqAction( 
	NdisZeroMemory(&ADDframe, sizeof(FRAME_ADDBA_RSP));



	// 2-1. Prepare ADDBA Response frame.

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		if (ADHOC_ON(pAd))

			ActHeaderInit(pAd, &ADDframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
@@ -1408,7 +1402,6 @@ VOID SendPSMPAction( 
		return;

	}



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[Wcid].Addr);



	Frame.Category = CATEGORY_HT;
@@ -1474,7 +1467,6 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( 
	// 		a. pointer pRxBlk->pData to payload

	//      b. modify pRxBlk->DataSize



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);



	ASSERT(pRxBlk->pRxPacket);
@@ -1490,14 +1482,11 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( 
	//

	if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU))

	{

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

#ifdef LINUX

		NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3);

#endif

	}

}

}





#define INDICATE_LEGACY_OR_AMSDU(_pAd, _pRxBlk, _fromWhichBSSID)		\

drivers/staging/rt2870/common/cmm_data.c

+16 −38
Original line number Diff line number Diff line
@@ -248,12 +248,9 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
		return NDIS_STATUS_FAILURE;

	}



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

	// outgoing frame always wakeup PHY to prevent frame lost

	if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))

		AsicForceWakeup(pAd, TRUE);

	}



	pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA +  TXINFO_SIZE);

	pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); //TXWI_SIZE);
@@ -277,7 +274,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
		pMacEntry = MacTableLookup(pAd, pHeader_802_11->Addr1);

	}



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		// Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode.

		if (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED
@@ -627,15 +623,11 @@ BOOLEAN RTMP_FillTxBlkInfo( 
			TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired);



		{

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			{



			// If support WMM, enable it.

			if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED) &&

				CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_WMM_CAPABLE))

				TX_BLK_SET_FLAG(pTxBlk, fTX_bWMM);

		}

		}



		if (pTxBlk->TxFrameType == TX_LEGACY_FRAME)

		{
@@ -887,7 +879,6 @@ VOID RTMPDeQueuePacket( 
			Count += pTxBlk->TxPacketList.Number;



			// Do HardTransmit now.

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			Status = STAHardTransmit(pAd, pTxBlk, QueIdx);



#if 0	// We should not break if HardTransmit failed. Well, at least now we should not!
@@ -1573,7 +1564,6 @@ UINT deaggregate_AMSDU_announce( 
		   kfree(Elem);

		}



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

	        	if (pRemovedLLCSNAP)

	        	{
@@ -1586,7 +1576,6 @@ UINT deaggregate_AMSDU_announce( 
		pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize);

		if (pClonePacket)

		{

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket));

		}
@@ -1684,8 +1673,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 


	FirstWcid = 1;



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)



	if (pAd->StaCfg.BssType == BSS_INFRA)

		FirstWcid = 2;
@@ -1710,7 +1697,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
				pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;

			}

			{

				IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

				{

					pEntry->ValidAsCLI = TRUE;

					pEntry->ValidAsWDS = FALSE;
@@ -1738,7 +1724,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
				pEntry->apidx = apidx;



			{

				IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

				{

					pEntry->AuthMode = pAd->StaCfg.AuthMode;

					pEntry->WepStatus = pAd->StaCfg.WepStatus;
@@ -2220,7 +2205,6 @@ VOID Indicate_Legacy_Packet( 
	// 2. remove LLC

	// 		a. pointer pRxBlk->pData to payload

	//      b. modify pRxBlk->DataSize

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);



	if (pRxBlk->DataSize > MAX_RX_PKT_LEN)
@@ -2283,7 +2267,6 @@ VOID Indicate_Legacy_Packet( 
	//

	// pass this 802.3 packet to upper layer or forward this packet to WM directly

	//

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID);

}
@@ -2343,7 +2326,6 @@ VOID CmmRxRalinkFrameIndicate( 
	}



	// get 802.3 Header and  remove LLC

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);



	ASSERT(pRxBlk->pRxPacket);
@@ -2355,7 +2337,6 @@ VOID CmmRxRalinkFrameIndicate( 


	pData2 = pRxBlk->pData + Payload1Size + LENGTH_802_3;



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	pPacket2 = duplicate_pkt(pAd, (pData2-LENGTH_802_3), LENGTH_802_3, pData2, Payload2Size, FromWhichBSSID);



	if (!pPacket2)
@@ -2369,12 +2350,10 @@ VOID CmmRxRalinkFrameIndicate( 
	pRxBlk->DataSize = Payload1Size;

	wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID);



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxBlk->pRxPacket, FromWhichBSSID);



	if (pPacket2)

	{

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);

	}

}
@@ -2518,7 +2497,6 @@ VOID Indicate_EAPOL_Packet( 
{

	MAC_TABLE_ENTRY *pEntry = NULL;



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		pEntry = &pAd->MacTab.Content[BSSID_WCID];

		STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID);

drivers/staging/rt2870/common/cmm_data_2870.c

+2 −8
Original line number Diff line number Diff line
@@ -846,11 +846,8 @@ VOID RT28xxUsbMlmeRadioOn( 
	if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF))

		return;



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

    	AsicSendCommandToMcu(pAd, 0x31, 0xff, 0x00, 0x00);

		RTMPusecDelay(10000);

	}



	NICResetFromError(pAd);
@@ -860,7 +857,6 @@ VOID RT28xxUsbMlmeRadioOn( 
	// Clear Radio off flag

	RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF);



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	RTUSBBulkReceive(pAd);



	// Set LED
@@ -883,7 +879,6 @@ VOID RT28xxUsbMlmeRadioOFF( 
	// Set Radio off flag

	RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF);



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		// Link down first if any association exists

		if (INFRA_ON(pAd) || ADHOC_ON(pAd))
@@ -931,7 +926,6 @@ VOID RT28xxUsbMlmeRadioOFF( 
		RTMPusecDelay(1000);

	}while (i++ < 100);



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x02);

}