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

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

Staging: rt2870: remove DOT11_N_SUPPORT ifdefs 



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

drivers/staging/rt2870/2870_main_dev.c

+0 −2
Original line number Diff line number Diff line
@@ -709,7 +709,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd) 
		}

	}



#ifdef DOT11_N_SUPPORT

	// For Sigma debug, dump the ba_reordering sequence.

	if((needDumpSeq == TRUE) && (pAd->CommonCfg.bDisableReordering == 0))

	{
@@ -737,7 +736,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd) 
			NdisReleaseSpinLock(&pBAEntry->RxReRingLock);

		}

	}

#endif // DOT11_N_SUPPORT //

}



/*

drivers/staging/rt2870/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ obj-$(CONFIG_RT2870) += rt2870sta.o 
EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT

EXTRA_CFLAGS += -DRT2870

EXTRA_CFLAGS += -DDBG

EXTRA_CFLAGS += -DDOT11_N_SUPPORT



rt2870sta-objs :=		\

	common/md5.o		\

drivers/staging/rt2870/ap.h

+0 −2
Original line number Diff line number Diff line
@@ -419,10 +419,8 @@ VOID ApLogEvent( 
    IN PUCHAR           pAddr,

    IN USHORT           Event);



#ifdef DOT11_N_SUPPORT

VOID APUpdateOperationMode(

    IN PRTMP_ADAPTER pAd);

#endif // DOT11_N_SUPPORT //



VOID APUpdateCapabilityAndErpIe(

	IN PRTMP_ADAPTER pAd);

drivers/staging/rt2870/chlist.h

+0 −8
Original line number Diff line number Diff line
@@ -957,16 +957,12 @@ static inline VOID ChBandCheck( 
	switch(PhyMode)

	{

		case PHY_11A:

#ifdef DOT11_N_SUPPORT

		case PHY_11AN_MIXED:

#endif // DOT11_N_SUPPORT //

			*pChType = BAND_5G;

			break;

		case PHY_11ABG_MIXED:

#ifdef DOT11_N_SUPPORT

		case PHY_11AGN_MIXED:

		case PHY_11ABGN_MIXED:

#endif // DOT11_N_SUPPORT //

			*pChType = BAND_BOTH;

			break;
@@ -1114,8 +1110,6 @@ static inline VOID BuildBeaconChList( 
	}

}





#ifdef DOT11_N_SUPPORT

static inline BOOLEAN IsValidChannel(

	IN PRTMP_ADAPTER pAd,

	IN UCHAR channel)
@@ -1273,8 +1267,6 @@ static inline VOID N_SetCenCh( 
		pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel;

	}

}

#endif // DOT11_N_SUPPORT //





static inline UINT8 GetCuntryMaxTxPwr(

	IN PRTMP_ADAPTER pAd,

drivers/staging/rt2870/common/action.c

+0 −8
Original line number Diff line number Diff line
@@ -73,13 +73,11 @@ VOID ActionStateMachineInit( 


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



#ifdef DOT11_N_SUPPORT

	StateMachineSetAction(S, ACT_IDLE, MT2_PEER_BA_CATE, (STATE_MACHINE_FUNC)PeerBAAction);

	StateMachineSetAction(S, ACT_IDLE, MT2_PEER_HT_CATE, (STATE_MACHINE_FUNC)PeerHTAction);

	StateMachineSetAction(S, ACT_IDLE, MT2_MLME_ADD_BA_CATE, (STATE_MACHINE_FUNC)MlmeADDBAAction);

	StateMachineSetAction(S, ACT_IDLE, MT2_MLME_ORI_DELBA_CATE, (STATE_MACHINE_FUNC)MlmeDELBAAction);

	StateMachineSetAction(S, ACT_IDLE, MT2_MLME_REC_DELBA_CATE, (STATE_MACHINE_FUNC)MlmeDELBAAction);

#endif // DOT11_N_SUPPORT //



	StateMachineSetAction(S, ACT_IDLE, MT2_PEER_PUBLIC_CATE, (STATE_MACHINE_FUNC)PeerPublicAction);

	StateMachineSetAction(S, ACT_IDLE, MT2_PEER_RM_CATE, (STATE_MACHINE_FUNC)PeerRMAction);
@@ -89,7 +87,6 @@ VOID ActionStateMachineInit( 
	StateMachineSetAction(S, ACT_IDLE, MT2_ACT_INVALID, (STATE_MACHINE_FUNC)MlmeInvalidAction);

}



#ifdef DOT11_N_SUPPORT

VOID MlmeADDBAAction(

    IN PRTMP_ADAPTER pAd,

    IN MLME_QUEUE_ELEM *Elem)
@@ -254,7 +251,6 @@ VOID MlmeDELBAAction( 
		DBGPRINT(RT_DEBUG_TRACE, ("BA - MlmeDELBAAction() . 3 DELBA sent. Initiator(%d)\n", pInfo->Initiator));

    	}

}

#endif // DOT11_N_SUPPORT //



VOID MlmeQOSAction(

    IN PRTMP_ADAPTER pAd,
@@ -282,7 +278,6 @@ VOID PeerQOSAction( 
{

}



#ifdef DOT11_N_SUPPORT

VOID PeerBAAction(

	IN PRTMP_ADAPTER pAd,

	IN MLME_QUEUE_ELEM *Elem)
@@ -302,7 +297,6 @@ VOID PeerBAAction( 
			break;

	}

}

#endif // DOT11_N_SUPPORT //



VOID PeerPublicAction(

	IN PRTMP_ADAPTER pAd,
@@ -337,7 +331,6 @@ VOID PeerRMAction( 
	return;

}



#ifdef DOT11_N_SUPPORT

static VOID respond_ht_information_exchange_action(

	IN PRTMP_ADAPTER pAd,

	IN MLME_QUEUE_ELEM *Elem)
@@ -557,7 +550,6 @@ VOID SendRefreshBAR( 
		}

	}

}

#endif // DOT11_N_SUPPORT //



VOID ActHeaderInit(

    IN	PRTMP_ADAPTER	pAd,