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

Staging: rt2860: remove dead QOS_DLS_SUPPORT code 



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

drivers/staging/rt2860/common/action.c

+0 −47
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ VOID ActionStateMachineInit( 
	StateMachineSetAction(S, ACT_IDLE, MT2_PEER_QOS_CATE, (STATE_MACHINE_FUNC)PeerQOSAction);



	StateMachineSetAction(S, ACT_IDLE, MT2_PEER_DLS_CATE, (STATE_MACHINE_FUNC)ReservedAction);

#ifdef QOS_DLS_SUPPORT

		StateMachineSetAction(S, ACT_IDLE, MT2_PEER_DLS_CATE, (STATE_MACHINE_FUNC)PeerDLSAction);

#endif // QOS_DLS_SUPPORT //



#ifdef DOT11_N_SUPPORT

	StateMachineSetAction(S, ACT_IDLE, MT2_PEER_BA_CATE, (STATE_MACHINE_FUNC)PeerBAAction);
@@ -137,13 +134,7 @@ VOID MlmeADDBAAction( 
			if (ADHOC_ON(pAd))

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

			else

#ifdef QOS_DLS_SUPPORT

			if (pAd->MacTab.Content[pInfo->Wcid].ValidAsDls)

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

			else

#endif // QOS_DLS_SUPPORT //

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



		}

#endif // CONFIG_STA_SUPPORT //
@@ -247,11 +238,6 @@ VOID MlmeDELBAAction( 
			if (ADHOC_ON(pAd))

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

			else

#ifdef QOS_DLS_SUPPORT

			if (pAd->MacTab.Content[pInfo->Wcid].ValidAsDls)

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

			else

#endif // QOS_DLS_SUPPORT //

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

		}

#endif // CONFIG_STA_SUPPORT //
@@ -299,39 +285,6 @@ VOID PeerQOSAction( 
{

}



#ifdef QOS_DLS_SUPPORT

VOID PeerDLSAction(

	IN PRTMP_ADAPTER pAd,

	IN MLME_QUEUE_ELEM *Elem)

{

	UCHAR	Action = Elem->Msg[LENGTH_802_11+1];



	switch(Action)

	{

		case ACTION_DLS_REQUEST:

#ifdef CONFIG_STA_SUPPORT

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			PeerDlsReqAction(pAd, Elem);

#endif // CONFIG_STA_SUPPORT //

			break;



		case ACTION_DLS_RESPONSE:

#ifdef CONFIG_STA_SUPPORT

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			PeerDlsRspAction(pAd, Elem);

#endif // CONFIG_STA_SUPPORT //

			break;



		case ACTION_DLS_TEARDOWN:

#ifdef CONFIG_STA_SUPPORT

			IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

			PeerDlsTearDownAction(pAd, Elem);

#endif // CONFIG_STA_SUPPORT //

			break;

	}

}

#endif // QOS_DLS_SUPPORT //



#ifdef DOT11_N_SUPPORT

VOID PeerBAAction(

	IN PRTMP_ADAPTER pAd,

drivers/staging/rt2860/common/ba_action.c

+0 −5
Original line number Diff line number Diff line
@@ -1230,11 +1230,6 @@ VOID PeerAddBAReqAction( 
		if (ADHOC_ON(pAd))

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

		else

#ifdef QOS_DLS_SUPPORT

		if (pAd->MacTab.Content[Elem->Wcid].ValidAsDls)

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

		else

#endif // QOS_DLS_SUPPORT //

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

	}

#endif // CONFIG_STA_SUPPORT //

drivers/staging/rt2860/common/cmm_data.c

+0 −44
Original line number Diff line number Diff line
@@ -1399,15 +1399,6 @@ VOID RTMPWriteTxWI_Data( 
	pTxWI->ACK		= TX_BLK_TEST_FLAG(pTxBlk, fTX_bAckRequired);

	pTxWI->txop		= pTxBlk->FrameGap;



#ifdef CONFIG_STA_SUPPORT

#ifdef QOS_DLS_SUPPORT

	if (pMacEntry &&

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

		(pMacEntry->ValidAsDls == TRUE))

		pTxWI->WirelessCliID = BSSID_WCID;

	else

#endif // QOS_DLS_SUPPORT //

#endif // CONFIG_STA_SUPPORT //

		pTxWI->WirelessCliID		= pTxBlk->Wcid;



	pTxWI->MPDUtotalByteCount	= pTxBlk->MpduHeaderLen + pTxBlk->SrcBufLen;
@@ -2401,11 +2392,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
			(pAd->MacTab.Content[i].ValidAsWDS == FALSE) &&

			(pAd->MacTab.Content[i].ValidAsApCli== FALSE) &&

			(pAd->MacTab.Content[i].ValidAsMesh == FALSE)

#ifdef CONFIG_STA_SUPPORT

#ifdef QOS_DLS_SUPPORT

			&& (pAd->MacTab.Content[i].ValidAsDls == FALSE)

#endif // QOS_DLS_SUPPORT //

#endif // CONFIG_STA_SUPPORT //

			)

		{

			pEntry = &pAd->MacTab.Content[i];
@@ -2417,20 +2403,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
				pEntry->PairwiseKey.KeyLen = 0;

				pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;

			}

#ifdef CONFIG_STA_SUPPORT

#ifdef QOS_DLS_SUPPORT

			if (apidx >= MIN_NET_DEVICE_FOR_DLS)

			{

				pEntry->ValidAsCLI = FALSE;

				pEntry->ValidAsWDS = FALSE;

				pEntry->ValidAsApCli = FALSE;

				pEntry->ValidAsMesh = FALSE;

				pEntry->ValidAsDls = TRUE;

				pEntry->isCached = FALSE;

			}

			else

#endif // QOS_DLS_SUPPORT //

#endif // CONFIG_STA_SUPPORT //

			{



#ifdef CONFIG_STA_SUPPORT
@@ -2459,12 +2431,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
				pEntry->apidx = (apidx - MIN_NET_DEVICE_FOR_APCLI);

			else if (pEntry->ValidAsWDS)

				pEntry->apidx = (apidx - MIN_NET_DEVICE_FOR_WDS);

#ifdef CONFIG_STA_SUPPORT

#ifdef QOS_DLS_SUPPORT

			else if (pEntry->ValidAsDls)

				pEntry->apidx = (apidx - MIN_NET_DEVICE_FOR_DLS);

#endif // QOS_DLS_SUPPORT //

#endif // CONFIG_STA_SUPPORT //

			else

				pEntry->apidx = apidx;
@@ -2489,11 +2455,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry( 
				(pAd->StaCfg.BssType == BSS_ADHOC))

				pEntry->PortSecured = WPA_802_1X_PORT_SECURED;

			else

#ifdef QOS_DLS_SUPPORT

			if (pEntry->ValidAsDls == TRUE)

				pEntry->PortSecured = WPA_802_1X_PORT_SECURED;

			else

#endif //QOS_DLS_SUPPORT

#endif // CONFIG_STA_SUPPORT //

			pEntry->PortSecured = WPA_802_1X_PORT_NOT_SECURED;

			pEntry->PMKID_CacheIdx = ENTRY_NOT_FOUND;
@@ -2565,11 +2526,6 @@ BOOLEAN MacTableDeleteEntry( 
	pEntry = &pAd->MacTab.Content[wcid];



	if (pEntry && (pEntry->ValidAsCLI || pEntry->ValidAsApCli || pEntry->ValidAsWDS || pEntry->ValidAsMesh

#ifdef CONFIG_STA_SUPPORT

#ifdef QOS_DLS_SUPPORT

 		|| pEntry->ValidAsDls

#endif // QOS_DLS_SUPPORT //

#endif // CONFIG_STA_SUPPORT //

		))

	{

		if (MAC_ADDR_EQUAL(pEntry->Addr, pAddr))

drivers/staging/rt2860/common/cmm_info.c

+0 −13
Original line number Diff line number Diff line
@@ -1748,11 +1748,6 @@ VOID RTMPAddWcidAttributeEntry( 
				Wcid = pEntry->Aid;

			else if (pEntry && INFRA_ON(pAd))

			{

#ifdef QOS_DLS_SUPPORT

				if (pEntry->ValidAsDls == TRUE)

					Wcid = pEntry->Aid;

				else

#endif // QOS_DLS_SUPPORT //

				Wcid = BSSID_WCID;

			}

			else
@@ -1769,14 +1764,6 @@ VOID RTMPAddWcidAttributeEntry( 
	{

		if (pEntry && pEntry->ValidAsMesh)

			WCIDAttri = (CipherAlg<<1) | PAIRWISEKEYTABLE;

#ifdef QOS_DLS_SUPPORT

		else if ((pEntry) && (pEntry->ValidAsDls) &&

					((CipherAlg == CIPHER_TKIP) ||

				 	(CipherAlg == CIPHER_TKIP_NO_MIC) ||

					(CipherAlg == CIPHER_AES) ||

				 	(CipherAlg == CIPHER_NONE)))

			WCIDAttri = (CipherAlg<<1) | PAIRWISEKEYTABLE;

#endif // QOS_DLS_SUPPORT //

		else

			WCIDAttri = (CipherAlg<<1) | SHAREDKEYTABLE;

	}

drivers/staging/rt2860/common/cmm_sanity.c

+0 −287
Original line number Diff line number Diff line
@@ -1344,290 +1344,3 @@ BOOLEAN PeerWpaMessageSanity( 
	return TRUE;



}
 


#ifdef CONFIG_STA_SUPPORT

#ifdef QOS_DLS_SUPPORT

BOOLEAN MlmeDlsReqSanity(

	IN PRTMP_ADAPTER pAd,

    IN VOID *Msg,

    IN ULONG MsgLen,

    OUT PRT_802_11_DLS *pDLS,

    OUT PUSHORT pReason)

{

	MLME_DLS_REQ_STRUCT *pInfo;



    pInfo = (MLME_DLS_REQ_STRUCT *)Msg;



	*pDLS = pInfo->pDLS;

	*pReason = pInfo->Reason;



	return TRUE;

}

#endif // QOS_DLS_SUPPORT //

#endif // CONFIG_STA_SUPPORT //



#ifdef QOS_DLS_SUPPORT

BOOLEAN PeerDlsReqSanity(

    IN PRTMP_ADAPTER pAd,

    IN VOID *Msg,

    IN ULONG MsgLen,

    OUT PUCHAR pDA,

    OUT PUCHAR pSA,

    OUT USHORT *pCapabilityInfo,

    OUT USHORT *pDlsTimeout,

    OUT UCHAR *pRatesLen,

    OUT UCHAR Rates[],

	OUT UCHAR *pHtCapabilityLen,

    OUT HT_CAPABILITY_IE *pHtCapability)

{

	CHAR            *Ptr;

    PFRAME_802_11	Fr = (PFRAME_802_11)Msg;

	PEID_STRUCT  eid_ptr;



    // to prevent caller from using garbage output value

    *pCapabilityInfo	= 0;

    *pDlsTimeout	= 0;

	*pHtCapabilityLen = 0;



    Ptr = Fr->Octet;



	// offset to destination MAC address (Category and Action field)

    Ptr += 2;



    // get DA from payload and advance the pointer

    NdisMoveMemory(pDA, Ptr, MAC_ADDR_LEN);

    Ptr += MAC_ADDR_LEN;



    // get SA from payload and advance the pointer

    NdisMoveMemory(pSA, Ptr, MAC_ADDR_LEN);

    Ptr += MAC_ADDR_LEN;



    // get capability info from payload and advance the pointer

    NdisMoveMemory(pCapabilityInfo, Ptr, 2);

    Ptr += 2;



    // get capability info from payload and advance the pointer

    NdisMoveMemory(pDlsTimeout, Ptr, 2);

    Ptr += 2;



	// Category and Action field + DA + SA + capability + Timeout

	eid_ptr = (PEID_STRUCT) &Fr->Octet[18];



	while (((UCHAR*)eid_ptr + eid_ptr->Len + 1) < ((UCHAR*)Fr + MsgLen))

	{

		switch(eid_ptr->Eid)

		{

			case IE_SUPP_RATES:

                if ((eid_ptr->Len <= MAX_LEN_OF_SUPPORTED_RATES) && (eid_ptr->Len > 0))

                {

                    NdisMoveMemory(Rates, eid_ptr->Octet, eid_ptr->Len);

                    DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsReqSanity - IE_SUPP_RATES., Len=%d. Rates[0]=%x\n",eid_ptr->Len, Rates[0]));

                    DBGPRINT(RT_DEBUG_TRACE, ("Rates[1]=%x %x %x %x %x %x %x\n", Rates[1], Rates[2], Rates[3], Rates[4], Rates[5], Rates[6], Rates[7]));

                    *pRatesLen = eid_ptr->Len;

                }

                else

                {

                    *pRatesLen = 8;

					Rates[0] = 0x82;

					Rates[1] = 0x84;

					Rates[2] = 0x8b;

					Rates[3] = 0x96;

					Rates[4] = 0x12;

					Rates[5] = 0x24;

					Rates[6] = 0x48;

					Rates[7] = 0x6c;

                    DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsReqSanity - wrong IE_SUPP_RATES., Len=%d\n",eid_ptr->Len));

                }

				break;



			case IE_EXT_SUPP_RATES:

                if (eid_ptr->Len + *pRatesLen <= MAX_LEN_OF_SUPPORTED_RATES)

                {

                    NdisMoveMemory(&Rates[*pRatesLen], eid_ptr->Octet, eid_ptr->Len);

                    *pRatesLen = (*pRatesLen) + eid_ptr->Len;

                }

                else

                {

                    NdisMoveMemory(&Rates[*pRatesLen], eid_ptr->Octet, MAX_LEN_OF_SUPPORTED_RATES - (*pRatesLen));

                    *pRatesLen = MAX_LEN_OF_SUPPORTED_RATES;

                }

				break;



			case IE_HT_CAP:

				if (eid_ptr->Len >= sizeof(HT_CAPABILITY_IE))

				{

					NdisMoveMemory(pHtCapability, eid_ptr->Octet, sizeof(HT_CAPABILITY_IE));



					*(USHORT *)(&pHtCapability->HtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->HtCapInfo));

					*(USHORT *)(&pHtCapability->ExtHtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->ExtHtCapInfo));

					*pHtCapabilityLen = sizeof(HT_CAPABILITY_IE);



					DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsReqSanity - IE_HT_CAP\n"));

				}

				else

				{

					DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsReqSanity - wrong IE_HT_CAP.eid_ptr->Len = %d\n", eid_ptr->Len));

				}

				break;



			default:

				break;

		}



		eid_ptr = (PEID_STRUCT)((UCHAR*)eid_ptr + 2 + eid_ptr->Len);

	}



    return TRUE;

}



BOOLEAN PeerDlsRspSanity(

    IN PRTMP_ADAPTER pAd,

    IN VOID *Msg,

    IN ULONG MsgLen,

    OUT PUCHAR pDA,

    OUT PUCHAR pSA,

    OUT USHORT *pCapabilityInfo,

    OUT USHORT *pStatus,

    OUT UCHAR *pRatesLen,

    OUT UCHAR Rates[],

    OUT UCHAR *pHtCapabilityLen,

    OUT HT_CAPABILITY_IE *pHtCapability)

{

    CHAR            *Ptr;

    PFRAME_802_11	Fr = (PFRAME_802_11)Msg;

	PEID_STRUCT  eid_ptr;



    // to prevent caller from using garbage output value

    *pStatus		= 0;

    *pCapabilityInfo	= 0;

	*pHtCapabilityLen = 0;



    Ptr = Fr->Octet;



	// offset to destination MAC address (Category and Action field)

    Ptr += 2;



	// get status code from payload and advance the pointer

    NdisMoveMemory(pStatus, Ptr, 2);

    Ptr += 2;



    // get DA from payload and advance the pointer

    NdisMoveMemory(pDA, Ptr, MAC_ADDR_LEN);

    Ptr += MAC_ADDR_LEN;



    // get SA from payload and advance the pointer

    NdisMoveMemory(pSA, Ptr, MAC_ADDR_LEN);

    Ptr += MAC_ADDR_LEN;



	if (pStatus == 0)

	{

	    // get capability info from payload and advance the pointer

	    NdisMoveMemory(pCapabilityInfo, Ptr, 2);

	    Ptr += 2;

	}



	// Category and Action field + status code + DA + SA + capability

	eid_ptr = (PEID_STRUCT) &Fr->Octet[18];



	while (((UCHAR*)eid_ptr + eid_ptr->Len + 1) < ((UCHAR*)Fr + MsgLen))

	{

		switch(eid_ptr->Eid)

		{

			case IE_SUPP_RATES:

                if ((eid_ptr->Len <= MAX_LEN_OF_SUPPORTED_RATES) && (eid_ptr->Len > 0))

                {

                    NdisMoveMemory(Rates, eid_ptr->Octet, eid_ptr->Len);

                    DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsRspSanity - IE_SUPP_RATES., Len=%d. Rates[0]=%x\n",eid_ptr->Len, Rates[0]));

                    DBGPRINT(RT_DEBUG_TRACE, ("Rates[1]=%x %x %x %x %x %x %x\n", Rates[1], Rates[2], Rates[3], Rates[4], Rates[5], Rates[6], Rates[7]));

                    *pRatesLen = eid_ptr->Len;

                }

                else

                {

                    *pRatesLen = 8;

					Rates[0] = 0x82;

					Rates[1] = 0x84;

					Rates[2] = 0x8b;

					Rates[3] = 0x96;

					Rates[4] = 0x12;

					Rates[5] = 0x24;

					Rates[6] = 0x48;

					Rates[7] = 0x6c;

                    DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsRspSanity - wrong IE_SUPP_RATES., Len=%d\n",eid_ptr->Len));

                }

				break;



			case IE_EXT_SUPP_RATES:

                if (eid_ptr->Len + *pRatesLen <= MAX_LEN_OF_SUPPORTED_RATES)

                {

                    NdisMoveMemory(&Rates[*pRatesLen], eid_ptr->Octet, eid_ptr->Len);

                    *pRatesLen = (*pRatesLen) + eid_ptr->Len;

                }

                else

                {

                    NdisMoveMemory(&Rates[*pRatesLen], eid_ptr->Octet, MAX_LEN_OF_SUPPORTED_RATES - (*pRatesLen));

                    *pRatesLen = MAX_LEN_OF_SUPPORTED_RATES;

                }

				break;



			case IE_HT_CAP:

				if (eid_ptr->Len >= sizeof(HT_CAPABILITY_IE))

				{

					NdisMoveMemory(pHtCapability, eid_ptr->Octet, sizeof(HT_CAPABILITY_IE));



					*(USHORT *)(&pHtCapability->HtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->HtCapInfo));

					*(USHORT *)(&pHtCapability->ExtHtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->ExtHtCapInfo));

					*pHtCapabilityLen = sizeof(HT_CAPABILITY_IE);



					DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsRspSanity - IE_HT_CAP\n"));

				}

				else

				{

					DBGPRINT(RT_DEBUG_TRACE, ("PeerDlsRspSanity - wrong IE_HT_CAP.eid_ptr->Len = %d\n", eid_ptr->Len));

				}

				break;



			default:

				break;

		}



		eid_ptr = (PEID_STRUCT)((UCHAR*)eid_ptr + 2 + eid_ptr->Len);

	}



    return TRUE;

}



BOOLEAN PeerDlsTearDownSanity(

    IN PRTMP_ADAPTER pAd,

    IN VOID *Msg,

    IN ULONG MsgLen,

    OUT PUCHAR pDA,

    OUT PUCHAR pSA,

    OUT USHORT *pReason)

{

    CHAR            *Ptr;

    PFRAME_802_11	Fr = (PFRAME_802_11)Msg;



    // to prevent caller from using garbage output value

    *pReason	= 0;



    Ptr = Fr->Octet;



	// offset to destination MAC address (Category and Action field)

    Ptr += 2;



    // get DA from payload and advance the pointer

    NdisMoveMemory(pDA, Ptr, MAC_ADDR_LEN);

    Ptr += MAC_ADDR_LEN;



    // get SA from payload and advance the pointer

    NdisMoveMemory(pSA, Ptr, MAC_ADDR_LEN);

    Ptr += MAC_ADDR_LEN;



	// get reason code from payload and advance the pointer

    NdisMoveMemory(pReason, Ptr, 2);

    Ptr += 2;



    return TRUE;

}

#endif // QOS_DLS_SUPPORT //