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

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

Staging: rt3070: 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 fa46aa71

drivers/staging/rt3070/2870_main_dev.c

+0 −2
Original line number Diff line number Diff line
@@ -718,7 +718,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))

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

		}

	}

#endif // DOT11_N_SUPPORT //

}



/*

drivers/staging/rt3070/Makefile

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

EXTRA_CFLAGS += -DRT2870 -DRT30xx -DRT3070

EXTRA_CFLAGS += -DDBG

EXTRA_CFLAGS += -DDOT11_N_SUPPORT



rt3070sta-objs :=		\

	common/md5.o		\

drivers/staging/rt3070/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/rt3070/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)
@@ -1230,8 +1224,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/rt3070/common/2870_rtmp_init.c

+0 −2
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ NDIS_STATUS NICInitTransmit( 
		IF_DEV_CONFIG_OPMODE_ON_STA(pAd)

		for(acidx=0; acidx<4; acidx++)

		{

#if 1 //def DOT11_N_SUPPORT

			PHT_TX_CONTEXT	pHTTXContext = &(pAd->TxContext[acidx]);



			NdisZeroMemory(pHTTXContext, sizeof(HT_TX_CONTEXT));
@@ -260,7 +259,6 @@ NDIS_STATUS NICInitTransmit( 
			pHTTXContext->BulkOutPipeId = acidx;

			pHTTXContext->bRingEmpty = TRUE;

			pHTTXContext->bCopySavePad = FALSE;

#endif // DOT11_N_SUPPORT //

			pAd->BulkOutPending[acidx] = FALSE;

		}