Staging: rt2860: remove dead CONFIG_AP_SUPPORT code (5a911fd6) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/staging/rt2860/2860_main_dev.c

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -477,7 +477,6 @@ static void rx_done_tasklet(unsigned long data)

	pAd->int_pending &= ~(INT_RX);		pAd->int_pending &= ~(INT_RX);

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	bReschedule = STARxDoneInterruptHandle(pAd, 0);		bReschedule = STARxDoneInterruptHandle(pAd, 0);

	RTMP_INT_LOCK(&pAd->irq_lock, flags);		RTMP_INT_LOCK(&pAd->irq_lock, flags);
	@@ -914,11 +913,8 @@ rt2860_interrupt(int irq, void *dev_instance)
	RTMPHandleTBTTInterrupt(pAd);		RTMPHandleTBTTInterrupt(pAd);
	}		}

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{
	if (IntSource.word & AutoWakeupInt)		if (IntSource.word & AutoWakeupInt)
	RTMPHandleTwakeupInterrupt(pAd);		RTMPHandleTwakeupInterrupt(pAd);
	}

	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}

drivers/staging/rt2860/common/action.c

+2 −7

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

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	if (ADHOC_ON(pAd))		if (ADHOC_ON(pAd))
	ActHeaderInit(pAd, &Frame.Hdr, pInfo->pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);		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.)		// SEND BAR (Send BAR to refresh peer reordering buffer.)
	Idx = pAd->MacTab.Content[pInfo->Wcid].BAOriWcidArray[pInfo->TID];		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);		BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress);

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

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	if (ADHOC_ON(pAd))		if (ADHOC_ON(pAd))
	ActHeaderInit(pAd, &Frame.Hdr, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);		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));		NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO));
	// 2-1. Prepare ADDBA Response frame.		// 2-1. Prepare ADDBA Response frame.
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	if (ADHOC_ON(pAd))		if (ADHOC_ON(pAd))
	ActHeaderInit(pAd, &HTINFOframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);		ActHeaderInit(pAd, &HTINFOframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
	@@ -522,7 +518,6 @@ VOID SendRefreshBAR(

	Sequence = pEntry->TxSeq[TID];		Sequence = pEntry->TxSeq[TID];

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

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

drivers/staging/rt2860/common/ba_action.c

+8 −19

Original line number	Original line	Diff line number	Diff line
	@@ -130,7 +130,6 @@ void Announce_Reordering_Packet(IN PRTMP_ADAPTER pAd,
	// pass this 802.3 packet to upper layer or forward this packet to WM directly		// 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));		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket, RTMP_GET_PACKET_IF(pPacket));
	}		}
	}		}
	@@ -606,7 +605,6 @@ VOID BAOriSessionAdd(
	return;		return;
	}		}

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

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

	pAd = pBAEntry->pAdapter;		pAd = pBAEntry->pAdapter;

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{
	// Do nothing if monitor mode is on		// Do nothing if monitor mode is on
	if (MONITOR_ON(pAd))		if (MONITOR_ON(pAd))
	return;		return;
	}

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

	@@ -1216,7 +1211,6 @@ VOID PeerAddBAReqAction(
	NdisZeroMemory(&ADDframe, sizeof(FRAME_ADDBA_RSP));		NdisZeroMemory(&ADDframe, sizeof(FRAME_ADDBA_RSP));

	// 2-1. Prepare ADDBA Response frame.		// 2-1. Prepare ADDBA Response frame.
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	if (ADHOC_ON(pAd))		if (ADHOC_ON(pAd))
	ActHeaderInit(pAd, &ADDframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);		ActHeaderInit(pAd, &ADDframe.Hdr, pAddr, pAd->CurrentAddress, pAd->CommonCfg.Bssid);
	@@ -1412,7 +1406,6 @@ VOID SendPSMPAction(
	return;		return;
	}		}

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

	Frame.Category = CATEGORY_HT;		Frame.Category = CATEGORY_HT;
	@@ -1478,7 +1471,6 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(
	// a. pointer pRxBlk->pData to payload		// a. pointer pRxBlk->pData to payload
	// b. modify pRxBlk->DataSize		// b. modify pRxBlk->DataSize

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);		RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);

	ASSERT(pRxBlk->pRxPacket);		ASSERT(pRxBlk->pRxPacket);
	@@ -1494,14 +1486,11 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(
	//		//
	if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU))		if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU))
	{		{
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{
	#ifdef LINUX		#ifdef LINUX
	NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3);		NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3);
	#endif		#endif
	}		}
	}		}
	}


	#define INDICATE_LEGACY_OR_AMSDU(_pAd, _pRxBlk, _fromWhichBSSID) \		#define INDICATE_LEGACY_OR_AMSDU(_pAd, _pRxBlk, _fromWhichBSSID) \

drivers/staging/rt2860/common/cmm_data.c

+18 −43

Original line number	Original line	Diff line number	Diff line
	@@ -339,12 +339,9 @@ NDIS_STATUS MlmeHardTransmitTxRing(
	return NDIS_STATUS_FAILURE;		return NDIS_STATUS_FAILURE;
	}		}

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{
	// outgoing frame always wakeup PHY to prevent frame lost		// outgoing frame always wakeup PHY to prevent frame lost
	if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))		if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
	AsicForceWakeup(pAd, FROM_TX);		AsicForceWakeup(pAd, FROM_TX);
	}

	pFirstTxWI =(PTXWI_STRUC)pSrcBufVA;		pFirstTxWI =(PTXWI_STRUC)pSrcBufVA;

	@@ -501,12 +498,9 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
	return NDIS_STATUS_FAILURE;		return NDIS_STATUS_FAILURE;
	}		}

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{
	// outgoing frame always wakeup PHY to prevent frame lost		// outgoing frame always wakeup PHY to prevent frame lost
	if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))		if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
	AsicForceWakeup(pAd, FROM_TX);		AsicForceWakeup(pAd, FROM_TX);
	}

	pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA + TXINFO_SIZE);		pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA + TXINFO_SIZE);
	pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); //TXWI_SIZE);		pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); //TXWI_SIZE);
	@@ -530,7 +524,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
	pMacEntry = MacTableLookup(pAd, pHeader_802_11->Addr1);		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.		// Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode.
	if (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED		if (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED
	@@ -829,14 +822,10 @@ BOOLEAN RTMP_FillTxBlkInfo(
	TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired);		TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired);

	{		{
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{

	// If support WMM, enable it.		// If support WMM, enable it.
	if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED))		if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED))
	TX_BLK_SET_FLAG(pTxBlk, fTX_bWMM);		TX_BLK_SET_FLAG(pTxBlk, fTX_bWMM);
	}		}
	}

	if (pTxBlk->TxFrameType == TX_LEGACY_FRAME)		if (pTxBlk->TxFrameType == TX_LEGACY_FRAME)
	{		{
	@@ -1108,7 +1097,6 @@ VOID RTMPDeQueuePacket(
	Count += pTxBlk->TxPacketList.Number;		Count += pTxBlk->TxPacketList.Number;

	// Do HardTransmit now.		// Do HardTransmit now.
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	Status = STAHardTransmit(pAd, pTxBlk, QueIdx);		Status = STAHardTransmit(pAd, pTxBlk, QueIdx);

	DEQUEUE_UNLOCK(&pAd->irq_lock, bIntContext, IrqFlags);		DEQUEUE_UNLOCK(&pAd->irq_lock, bIntContext, IrqFlags);
	@@ -2146,7 +2134,6 @@ UINT deaggregate_AMSDU_announce(
	kfree(Elem);		kfree(Elem);
	}		}

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	if (pRemovedLLCSNAP)		if (pRemovedLLCSNAP)
	{		{
	@@ -2159,7 +2146,6 @@ UINT deaggregate_AMSDU_announce(
	pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize);		pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize);
	if (pClonePacket)		if (pClonePacket)
	{		{
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket));		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket));
	}		}

	@@ -2257,8 +2243,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(

	FirstWcid = 1;		FirstWcid = 1;

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	if (pAd->StaCfg.BssType == BSS_INFRA)		if (pAd->StaCfg.BssType == BSS_INFRA)
	FirstWcid = 2;		FirstWcid = 2;

	@@ -2283,7 +2267,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
	pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;		pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;
	}		}
	{		{
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	pEntry->ValidAsCLI = TRUE;		pEntry->ValidAsCLI = TRUE;
	pEntry->ValidAsWDS = FALSE;		pEntry->ValidAsWDS = FALSE;
	@@ -2311,7 +2294,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
	pEntry->apidx = apidx;		pEntry->apidx = apidx;

	{		{
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	pEntry->AuthMode = pAd->StaCfg.AuthMode;		pEntry->AuthMode = pAd->StaCfg.AuthMode;
	pEntry->WepStatus = pAd->StaCfg.WepStatus;		pEntry->WepStatus = pAd->StaCfg.WepStatus;
	@@ -2796,7 +2778,6 @@ VOID Indicate_Legacy_Packet(
	// 2. remove LLC		// 2. remove LLC
	// a. pointer pRxBlk->pData to payload		// a. pointer pRxBlk->pData to payload
	// b. modify pRxBlk->DataSize		// b. modify pRxBlk->DataSize
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);		RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);

	if (pRxBlk->DataSize > MAX_RX_PKT_LEN)		if (pRxBlk->DataSize > MAX_RX_PKT_LEN)
	@@ -2816,7 +2797,6 @@ VOID Indicate_Legacy_Packet(
	//		//
	// pass this 802.3 packet to upper layer or forward this packet to WM directly		// 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);		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID);
	}		}

	@@ -2876,7 +2856,6 @@ VOID CmmRxRalinkFrameIndicate(
	}		}

	// get 802.3 Header and remove LLC		// 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);		RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);

	ASSERT(pRxBlk->pRxPacket);		ASSERT(pRxBlk->pRxPacket);
	@@ -2888,7 +2867,6 @@ VOID CmmRxRalinkFrameIndicate(

	pData2 = pRxBlk->pData + Payload1Size + LENGTH_802_3;		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);		pPacket2 = duplicate_pkt(pAd, (pData2-LENGTH_802_3), LENGTH_802_3, pData2, Payload2Size, FromWhichBSSID);

	if (!pPacket2)		if (!pPacket2)
	@@ -2902,12 +2880,10 @@ VOID CmmRxRalinkFrameIndicate(
	pRxBlk->DataSize = Payload1Size;		pRxBlk->DataSize = Payload1Size;
	wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID);		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);		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxBlk->pRxPacket, FromWhichBSSID);

	if (pPacket2)		if (pPacket2)
	{		{
	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);
	}		}
	}		}
	@@ -3051,7 +3027,6 @@ VOID Indicate_EAPOL_Packet(
	{		{
	MAC_TABLE_ENTRY *pEntry = NULL;		MAC_TABLE_ENTRY *pEntry = NULL;

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	pEntry = &pAd->MacTab.Content[BSSID_WCID];		pEntry = &pAd->MacTab.Content[BSSID_WCID];
	STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID);		STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID);

drivers/staging/rt2860/common/cmm_data_2860.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1105,7 +1105,6 @@ VOID RT28xxPciMlmeRadioOFF(
	// Set LED		// Set LED
	RTMPSetLED(pAd, LED_RADIO_OFF);		RTMPSetLED(pAd, LED_RADIO_OFF);

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
	{		{
	BOOLEAN Cancelled;		BOOLEAN Cancelled;