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

Staging: rt2870: 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 6a28a69a

drivers/staging/rt2870/2870_main_dev.c

+0 −8
Original line number Diff line number Diff line
@@ -46,12 +46,10 @@ 
// Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. ***

MODULE_AUTHOR("Paul Lin <paul_lin@ralinktech.com>");

MODULE_DESCRIPTION("RT2870 Wireless Lan Linux Driver");

#ifdef CONFIG_STA_SUPPORT

MODULE_LICENSE("GPL");

#ifdef MODULE_VERSION

MODULE_VERSION(STA_DRIVER_VERSION);

#endif

#endif // CONFIG_STA_SUPPORT //



/* Kernel thread and vars, which handles packets that are completed. Only

 * packets that have a "complete" function are sent here. This way, the
@@ -1283,13 +1281,10 @@ VOID RT2870_BssBeaconStop( 
	{

		INT NumOfBcn;





#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

			NumOfBcn = MAX_MESH_NUM;

		}

#endif // CONFIG_STA_SUPPORT //



		RTMPCancelTimer(&pAd->CommonCfg.BeaconUpdateTimer, &Cancelled);
@@ -1322,13 +1317,10 @@ VOID RT2870_BssBeaconStart( 
	{

		INT NumOfBcn;





#ifdef CONFIG_STA_SUPPORT

		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		{

			NumOfBcn = MAX_MESH_NUM;

		}

#endif // CONFIG_STA_SUPPORT //



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

		{

drivers/staging/rt2870/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ obj-$(CONFIG_RT2870) += rt2870sta.o 
# TODO: all of these should be removed

EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT

EXTRA_CFLAGS += -DRT2870

EXTRA_CFLAGS += -DCONFIG_STA_SUPPORT

EXTRA_CFLAGS += -DDBG

EXTRA_CFLAGS += -DDOT11_N_SUPPORT

EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT

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

+0 −3
Original line number Diff line number Diff line
@@ -825,8 +825,6 @@ NDIS_STATUS CreateThreads( 
	return NDIS_STATUS_SUCCESS;

}





#ifdef CONFIG_STA_SUPPORT

/*

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

Routine Description:
@@ -1007,7 +1005,6 @@ VOID RTMPAddBSSIDCipher( 
		DBGPRINT_RAW(RT_DEBUG_TRACE,(" %x:", pKey->KeyMaterial[i]));

	DBGPRINT(RT_DEBUG_TRACE,("	 \n"));

}

#endif // CONFIG_STA_SUPPORT //



/*

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

drivers/staging/rt2870/common/action.c

+3 −13
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;
@@ -212,10 +210,8 @@ 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.
@@ -233,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))
@@ -241,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;
@@ -368,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))
@@ -376,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;
@@ -405,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
@@ -415,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;
@@ -544,11 +537,8 @@ 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/rt2870/common/ba_action.c

+3 −18
Original line number Diff line number Diff line
@@ -133,10 +133,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 //

	}

}
@@ -606,11 +604,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.
@@ -1079,14 +1074,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];
@@ -1219,8 +1212,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))
@@ -1228,7 +1221,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;
@@ -1295,9 +1288,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;
@@ -1418,10 +1409,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;
@@ -1486,10 +1476,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);
@@ -1504,15 +1492,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 //

	}

}