Commit 6a28a69a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rt2860: remove CONFIG_STA_SUPPORT ifdefs 



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

drivers/staging/rt2860/2860_main_dev.c

+1 −11
Original line number Diff line number Diff line
@@ -103,13 +103,10 @@ static struct pci_device_id rt2860_pci_tbl[] __devinitdata = 
};



MODULE_DEVICE_TABLE(pci, rt2860_pci_tbl);

#ifdef CONFIG_STA_SUPPORT

MODULE_LICENSE("GPL");

#ifdef MODULE_VERSION

MODULE_VERSION(STA_DRIVER_VERSION);

#endif

#endif // CONFIG_STA_SUPPORT //





//

// Our PCI driver structure
@@ -479,10 +476,9 @@ static void rx_done_tasklet(unsigned long data) 
    pObj = (POS_COOKIE) pAd->OS_Cookie;



	pAd->int_pending &= ~(INT_RX);

#ifdef CONFIG_STA_SUPPORT



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		bReschedule = STARxDoneInterruptHandle(pAd, 0);

#endif // CONFIG_STA_SUPPORT //



	RTMP_INT_LOCK(&pAd->irq_lock, flags);

	/*
@@ -918,15 +914,11 @@ rt2860_interrupt(int irq, void *dev_instance) 
		RTMPHandleTBTTInterrupt(pAd);

	}







#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		if (IntSource.word & AutoWakeupInt)

			RTMPHandleTwakeupInterrupt(pAd);

	}

#endif // CONFIG_STA_SUPPORT //



    return  IRQ_HANDLED;

}
@@ -1195,7 +1187,6 @@ VOID RT28xx_UpdateBeaconToAsic( 


}



#ifdef CONFIG_STA_SUPPORT

VOID RTMPInitPCIeLinkCtrlValue(

	IN	PRTMP_ADAPTER	pAd)

{
@@ -1239,7 +1230,6 @@ VOID RTMPPCIeLinkCtrlSetting( 
	IN 	USHORT		Max)

{

}

#endif // CONFIG_STA_SUPPORT //



VOID rt2860_stop(struct net_device *net_dev)

{

drivers/staging/rt2860/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ obj-$(CONFIG_RT2860) += rt2860sta.o 


# TODO: all of these should be removed

EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT

EXTRA_CFLAGS += -DCONFIG_STA_SUPPORT

EXTRA_CFLAGS += -DDBG

EXTRA_CFLAGS += -DDOT11_N_SUPPORT

EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT

drivers/staging/rt2860/common/action.c

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

		}



#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

			if (ADHOC_ON(pAd))
@@ -136,7 +135,6 @@ VOID MlmeADDBAAction( 
			else

				ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pInfo->pAddr);

		}

#endif // CONFIG_STA_SUPPORT //



		Frame.Category = CATEGORY_BA;

		Frame.Action = ADDBA_REQ;
@@ -211,10 +209,9 @@ VOID MlmeDELBAAction( 


		// SEND BAR (Send BAR to refresh peer reordering buffer.)

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

#ifdef CONFIG_STA_SUPPORT



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //



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

		FrameBar.StartingSeq.field.StartSeq = pAd->MacTab.Content[pInfo->Wcid].TxSeq[pInfo->TID]; // make sure sequence not clear in DEL funciton.
@@ -232,7 +229,7 @@ VOID MlmeDELBAAction( 


		// SEND DELBA FRAME

		FrameLen = 0;

#ifdef CONFIG_STA_SUPPORT



		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

			if (ADHOC_ON(pAd))
@@ -240,7 +237,7 @@ VOID MlmeDELBAAction( 
			else

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

		}

#endif // CONFIG_STA_SUPPORT //



		Frame.Category = CATEGORY_BA;

		Frame.Action = DELBA;

		Frame.DelbaParm.Initiator = pInfo->Initiator;
@@ -367,7 +364,6 @@ static VOID respond_ht_information_exchange_action( 


	NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO));

	// 2-1. Prepare ADDBA Response frame.

#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		if (ADHOC_ON(pAd))
@@ -375,7 +371,6 @@ static VOID respond_ht_information_exchange_action( 
		else

			ActHeaderInit(pAd, &HTINFOframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr);

	}

#endif // CONFIG_STA_SUPPORT //



	HTINFOframe.Category = CATEGORY_HT;

	HTINFOframe.Action = HT_INFO_EXCHANGE;
@@ -404,7 +399,7 @@ VOID PeerHTAction( 
	{

		case NOTIFY_BW_ACTION:

			DBGPRINT(RT_DEBUG_TRACE,("ACTION - HT Notify Channel bandwidth action----> \n"));

#ifdef CONFIG_STA_SUPPORT



			if(pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE)

			{

				// Note, this is to patch DIR-1353 AP. When the AP set to Wep, it will use legacy mode. But AP still keeps
@@ -414,7 +409,6 @@ VOID PeerHTAction( 
								Elem->Msg[LENGTH_802_11+2] ));

				break;

			}

#endif // CONFIG_STA_SUPPORT //



			if (Elem->Msg[LENGTH_802_11+2] == 0)	// 7.4.8.2. if value is 1, keep the same as supported channel bandwidth.

				pAd->MacTab.Content[Elem->Wcid].HTPhyMode.field.BW = 0;
@@ -534,10 +528,9 @@ VOID SendRefreshBAR( 
			}



			Sequence = pEntry->TxSeq[TID];

#ifdef CONFIG_STA_SUPPORT



			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //



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

			FrameBar.StartingSeq.field.StartSeq = Sequence; // make sure sequence not clear in DEL funciton.

drivers/staging/rt2860/common/ba_action.c

+3 −18
Original line number Diff line number Diff line
@@ -132,10 +132,8 @@ void Announce_Reordering_Packet(IN PRTMP_ADAPTER pAd, 
		// pass this 802.3 packet to upper layer or forward this packet to WM directly

		//



#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //

	}

}
@@ -610,11 +608,8 @@ VOID BAOriSessionAdd( 
			return;

		}





#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //



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

		FrameBar.StartingSeq.field.StartSeq = pBAEntry->Sequence; // make sure sequence not clear in DEL funciton.
@@ -1083,14 +1078,12 @@ VOID BAOriSessionSetupTimeout( 


	pAd = pBAEntry->pAdapter;



#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		// Do nothing if monitor mode is on

		if (MONITOR_ON(pAd))

			return;

	}

#endif // CONFIG_STA_SUPPORT //



	pEntry = &pAd->MacTab.Content[pBAEntry->Wcid];
@@ -1223,8 +1216,8 @@ VOID PeerAddBAReqAction( 
	}



	NdisZeroMemory(&ADDframe, sizeof(FRAME_ADDBA_RSP));



	// 2-1. Prepare ADDBA Response frame.

#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		if (ADHOC_ON(pAd))
@@ -1232,7 +1225,7 @@ VOID PeerAddBAReqAction( 
		else

			ActHeaderInit(pAd, &ADDframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr);

	}

#endif // CONFIG_STA_SUPPORT //



	ADDframe.Category = CATEGORY_BA;

	ADDframe.Action = ADDBA_RESP;

	ADDframe.Token = pAddreqFrame->Token;
@@ -1299,9 +1292,7 @@ VOID PeerAddBARspAction( 
		}

		// Rcv Decline StatusCode

		if ((pFrame->StatusCode == 37)

#ifdef CONFIG_STA_SUPPORT

            || ((pAd->OpMode == OPMODE_STA) && STA_TGN_WIFI_ON(pAd) && (pFrame->StatusCode != 0))

#endif // CONFIG_STA_SUPPORT //

            )

		{

			pAd->MacTab.Content[Elem->Wcid].BADeclineBitmap |= 1<<pFrame->BaParm.TID;
@@ -1422,10 +1413,9 @@ VOID SendPSMPAction( 
		DBGPRINT(RT_DEBUG_ERROR,("BA - MlmeADDBAAction() allocate memory failed \n"));

		return;

	}

#ifdef CONFIG_STA_SUPPORT



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //



	Frame.Category = CATEGORY_HT;

	Frame.Action = SMPS_ACTION;
@@ -1490,10 +1480,8 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( 
	// 		a. pointer pRxBlk->pData to payload

	//      b. modify pRxBlk->DataSize



#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);

#endif // CONFIG_STA_SUPPORT //



	ASSERT(pRxBlk->pRxPacket);

	pRxPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket);
@@ -1508,15 +1496,12 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet( 
	//

	if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU))

	{



#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

#ifdef LINUX

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

#endif

		}

#endif // CONFIG_STA_SUPPORT //

	}

}

drivers/staging/rt2860/common/cmm_data.c

+8 −54
Original line number Diff line number Diff line
@@ -339,15 +339,13 @@ NDIS_STATUS MlmeHardTransmitTxRing( 
		return NDIS_STATUS_FAILURE;

	}





#ifdef CONFIG_STA_SUPPORT

	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, FROM_TX);

	}

#endif // CONFIG_STA_SUPPORT //



	pFirstTxWI	=(PTXWI_STRUC)pSrcBufVA;



	pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXWI_SIZE);
@@ -377,7 +375,7 @@ NDIS_STATUS MlmeHardTransmitTxRing( 
	//

	//

	// In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame

#ifdef CONFIG_STA_SUPPORT



    // Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD

	if (pHeader_802_11->FC.Type != BTYPE_DATA)

    {
@@ -390,7 +388,6 @@ NDIS_STATUS MlmeHardTransmitTxRing( 
    		pHeader_802_11->FC.PwrMgmt = pAd->CommonCfg.bAPSDForcePowerSave;

    	}

    }

#endif // CONFIG_STA_SUPPORT //



	bInsertTimestamp = FALSE;

	if (pHeader_802_11->FC.Type == BTYPE_CNTL) // must be PS-POLL
@@ -504,14 +501,12 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
		return NDIS_STATUS_FAILURE;

	}



#ifdef CONFIG_STA_SUPPORT

	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, FROM_TX);

	}

#endif // CONFIG_STA_SUPPORT //



	pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA +  TXINFO_SIZE);

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

	}



#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

		// Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode.
@@ -551,7 +545,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
				pAd->CommonCfg.MlmeTransmit.field.MODE = 0;

		}

	}

#endif // CONFIG_STA_SUPPORT //



	//

	// Should not be hard code to set PwrMgmt to 0 (PWR_ACTIVE)
@@ -561,7 +554,7 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
	// pHeader_802_11->FC.PwrMgmt = 0; // (pAd->StaCfg.Psm == PWR_SAVE);

	//

	// In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame

#ifdef CONFIG_STA_SUPPORT



    // Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD

	if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL))

	{
@@ -571,18 +564,15 @@ NDIS_STATUS MlmeHardTransmitMgmtRing( 
		else

			pHeader_802_11->FC.PwrMgmt = PWR_ACTIVE;

	}

#endif // CONFIG_STA_SUPPORT //



	bInsertTimestamp = FALSE;

	if (pHeader_802_11->FC.Type == BTYPE_CNTL) // must be PS-POLL

	{

#ifdef CONFIG_STA_SUPPORT

		//Set PM bit in ps-poll, to fix WLK 1.2  PowerSaveMode_ext failure issue.

		if ((pAd->OpMode == OPMODE_STA) && (pHeader_802_11->FC.SubType == SUBTYPE_PS_POLL))

		{

			pHeader_802_11->FC.PwrMgmt = PWR_SAVE;

		}

#endif // CONFIG_STA_SUPPORT //

		bAckRequired = FALSE;

	}

	else // BTYPE_MGMT or BTYPE_DATA(must be NULL frame)
@@ -845,8 +835,6 @@ BOOLEAN RTMP_FillTxBlkInfo( 
			TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired);



		{



#ifdef CONFIG_STA_SUPPORT

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			{
@@ -854,7 +842,6 @@ BOOLEAN RTMP_FillTxBlkInfo( 
				if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED))

					TX_BLK_SET_FLAG(pTxBlk, fTX_bWMM);

			}

#endif // CONFIG_STA_SUPPORT //

		}



		if (pTxBlk->TxFrameType == TX_LEGACY_FRAME)
@@ -934,13 +921,10 @@ BOOLEAN CanDoAggregateTransmit( 
		return FALSE;

	}



#ifdef CONFIG_STA_SUPPORT

	if ((INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA)) // must be unicast to AP

		return TRUE;

	else

#endif // CONFIG_STA_SUPPORT //

		return FALSE;



}
@@ -1133,10 +1117,8 @@ VOID RTMPDeQueuePacket( 
			Count += pTxBlk->TxPacketList.Number;



				// Do HardTransmit now.

#ifdef CONFIG_STA_SUPPORT

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

				Status = STAHardTransmit(pAd, pTxBlk, QueIdx);

#endif // CONFIG_STA_SUPPORT //



			DEQUEUE_UNLOCK(&pAd->irq_lock, bIntContext, IrqFlags);

			// static rate also need NICUpdateFifoStaCounters() function.
@@ -2178,7 +2160,6 @@ UINT deaggregate_AMSDU_announce( 
		// convert to 802.3 header

        CONVERT_TO_802_3(Header802_3, pDA, pSA, pPayload, PayloadSize, pRemovedLLCSNAP);



#ifdef CONFIG_STA_SUPPORT

		if ((Header802_3[12] == 0x88) && (Header802_3[13] == 0x8E) )

		{

		    // avoid local heap overflow, use dyanamic allocation
@@ -2188,9 +2169,7 @@ UINT deaggregate_AMSDU_announce( 
		   WpaEAPOLKeyAction(pAd, Elem);

		   kfree(Elem);

		}

#endif // CONFIG_STA_SUPPORT //



#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

	        	if (pRemovedLLCSNAP)
@@ -2200,15 +2179,12 @@ UINT deaggregate_AMSDU_announce( 
	    			NdisMoveMemory(pPayload, &Header802_3[0], LENGTH_802_3);

	        	}

		}

#endif // CONFIG_STA_SUPPORT //



		pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize);

		if (pClonePacket)

		{

#ifdef CONFIG_STA_SUPPORT

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //

		}
@@ -2304,11 +2280,11 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
		return NULL;



	FirstWcid = 1;

#ifdef CONFIG_STA_SUPPORT



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)



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

		FirstWcid = 2;

#endif // CONFIG_STA_SUPPORT //



	// allocate one MAC entry

	NdisAcquireSpinLock(&pAd->MacTabLock);
@@ -2331,8 +2307,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
				pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;

			}

			{



#ifdef CONFIG_STA_SUPPORT

				IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

				{

					pEntry->ValidAsCLI = TRUE;
@@ -2341,7 +2315,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
					pEntry->ValidAsMesh = FALSE;

					pEntry->ValidAsDls = FALSE;

				}

#endif // CONFIG_STA_SUPPORT //

			}



			pEntry->bIAmBadAtheros = FALSE;
@@ -2362,8 +2335,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
				pEntry->apidx = apidx;



			{



#ifdef CONFIG_STA_SUPPORT

				IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

				{

					pEntry->AuthMode = pAd->StaCfg.AuthMode;
@@ -2371,19 +2342,18 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
					pEntry->PrivacyFilter = Ndis802_11PrivFilterAcceptAll;

					AsicRemovePairwiseKeyEntry(pAd, pEntry->apidx, (UCHAR)i);

				}

#endif // CONFIG_STA_SUPPORT //

			}



			pEntry->GTKState = REKEY_NEGOTIATING;

			pEntry->PairwiseKey.KeyLen = 0;

			pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;

#ifdef CONFIG_STA_SUPPORT



			if ((pAd->OpMode == OPMODE_STA) &&

				(pAd->StaCfg.BssType == BSS_ADHOC))

				pEntry->PortSecured = WPA_802_1X_PORT_SECURED;

			else

#endif // CONFIG_STA_SUPPORT //

			pEntry->PortSecured = WPA_802_1X_PORT_NOT_SECURED;



			pEntry->PMKID_CacheIdx = ENTRY_NOT_FOUND;

			COPY_MAC_ADDR(pEntry->Addr, pAddr);

			pEntry->Sst = SST_NOT_AUTH;
@@ -2858,10 +2828,8 @@ VOID Indicate_Legacy_Packet( 
	// 2. remove LLC

	// 		a. pointer pRxBlk->pData to payload

	//      b. modify pRxBlk->DataSize

#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);

#endif // CONFIG_STA_SUPPORT //



	if (pRxBlk->DataSize > MAX_RX_PKT_LEN)

	{
@@ -2880,11 +2848,8 @@ VOID Indicate_Legacy_Packet( 
	//

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

	//

#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID);

#endif // CONFIG_STA_SUPPORT //



}
@@ -2947,11 +2912,8 @@ VOID CmmRxRalinkFrameIndicate( 
	}



	// get 802.3 Header and  remove LLC

#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);

#endif // CONFIG_STA_SUPPORT //





	ASSERT(pRxBlk->pRxPacket);
@@ -2961,10 +2923,9 @@ VOID CmmRxRalinkFrameIndicate( 
	Payload2Size = Msdu2Size - LENGTH_802_3;



	pData2 = pRxBlk->pData + Payload1Size + LENGTH_802_3;

#ifdef CONFIG_STA_SUPPORT



	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //



	if (!pPacket2)

	{
@@ -2977,17 +2938,13 @@ VOID CmmRxRalinkFrameIndicate( 
	pRxBlk->DataSize = Payload1Size;

	wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID);



#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

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

#endif // CONFIG_STA_SUPPORT //



	if (pPacket2)

	{

#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);

#endif // CONFIG_STA_SUPPORT //

	}

}
@@ -3130,15 +3087,12 @@ VOID Indicate_EAPOL_Packet( 
{

	MAC_TABLE_ENTRY *pEntry = NULL;





#ifdef CONFIG_STA_SUPPORT

	IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

	{

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

		STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID);

		return;

	}

#endif // CONFIG_STA_SUPPORT //



	if (pEntry == NULL)

	{