Staging: rt2860: remove dead code (96f139ee) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/staging/rt2860/ap.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -516,9 +516,6 @@ BOOLEAN APPeerBeaconAndProbeRspSanity(
		OUT BOOLEAN *ExtendedRateIeExist,
		OUT UCHAR *Erp);

		// ap_info.c



		// ================== end of AP RTMP.h ========================

drivers/staging/rt2860/chlist.h

+0 −43

Original line number	Diff line number	Diff line
		@@ -1195,49 +1195,6 @@ static inline VOID N_ChannelCheck(
		pAd->CommonCfg.RegTransmitSetting.field.BW = BW_20;
		//pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_NONE; // We didn't set the ExtCh as NONE due to it'll set in RTMPSetHT()
		}
		#if 0
		switch (pAd->CommonCfg.CountryRegion & 0x7f)
		{
		case REGION_0_BG_BAND: // 1 -11
		case REGION_1_BG_BAND: // 1 - 13
		case REGION_5_BG_BAND: // 1 - 14
		if (Channel <= 4)
		{
		pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_ABOVE;
		}
		else if (Channel >= 8)
		{
		if ((ChannelNum - Channel) < 4)
		pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_BELOW;
		}
		break;

		case REGION_2_BG_BAND: // 10 - 11
		case REGION_3_BG_BAND: // 10 - 13
		case REGION_4_BG_BAND: // 14
		pAd->CommonCfg.RegTransmitSetting.field.BW = BW_20;
		break;

		case REGION_6_BG_BAND: // 3 - 9
		if (Channel <= 5)
		pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_ABOVE;
		else if (Channel == 6)
		pAd->CommonCfg.RegTransmitSetting.field.BW = BW_20;
		else if (Channel >= 7)
		pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_BELOW;
		break;

		case REGION_7_BG_BAND: // 5 - 13
		if (Channel <= 8)
		pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_ABOVE;
		else if (Channel >= 10)
		pAd->CommonCfg.RegTransmitSetting.field.EXTCHA = EXTCHA_BELOW;
		break;

		default: // Error. should never happen
		break;
		}
		#endif
		}
		}

drivers/staging/rt2860/common/ba_action.c

+1 −50

Original line number	Diff line number	Diff line
		@@ -444,9 +444,6 @@ void ba_flush_reordering_timeout_mpdus(
		&& (pBAEntry->list.qlen > 0)
		)
		{
		// printk("timeout[%d] (%lx-%lx = %d > %d): %x, ", pBAEntry->list.qlen, Now32, (pBAEntry->LastIndSeqAtTimer),
		// (int)((long) Now32 - (long)(pBAEntry->LastIndSeqAtTimer)), REORDERING_PACKET_TIMEOUT,
		// pBAEntry->LastIndSeq);
		//
		// force LastIndSeq to shift to LastIndSeq+1
		//
		@@ -463,22 +460,7 @@ void ba_flush_reordering_timeout_mpdus(
		pBAEntry->LastIndSeq = Sequence;
		}

		//printk("%x, flush one!\n", pBAEntry->LastIndSeq);

		}
		#if 0
		else if (
		(RTMP_TIME_AFTER((unsigned long)Now32, (unsigned long)(pBAEntry->LastIndSeqAtTimer+(MAX_REORDERING_PACKET_TIMEOUT))) &&
		(pBAEntry->list.qlen > 1))
		)
		{
		DBGPRINT(RT_DEBUG_TRACE,("timeout[%d] (%lx-%lx = %d > %d): %x\n ", pBAEntry->list.qlen, Now32, (pBAEntry->LastIndSeqAtTimer),
		(int)((long) Now32 - (long)(pBAEntry->LastIndSeqAtTimer)), MAX_REORDERING_PACKET_TIMEOUT,
		pBAEntry->LastIndSeq));
		ba_refresh_reordering_mpdus(pAd, pBAEntry);
		pBAEntry->LastIndSeqAtTimer = Now32;
		}
		#endif
		}


		@@ -692,10 +674,6 @@ BOOLEAN BARecSessionAdd(
		RTMPInitTimer(pAd, &pBAEntry->RECBATimer, GET_TIMER_FUNCTION(BARecSessionIdleTimeout), pBAEntry, TRUE);
		}

		#if 0 // for debugging
		RTMPSetTimer(&pBAEntry->RECBATimer, REC_BA_SESSION_IDLE_TIMEOUT);
		#endif

		// Set Bitmap flag.
		pEntry->RXBAbitmap \|= (1<<TID);
		pEntry->BARecWcidArray[TID] = Idx;
		@@ -1556,13 +1534,9 @@ static VOID ba_enqueue_reordering_packet(
		}
		else
		{
		#if 0
		DBGPRINT(RT_DEBUG_ERROR, ("!!! (%d:%d) Can't allocate reordering mpdu blk\n",
		blk_count, pBAEntry->list.qlen));
		#else
		DBGPRINT(RT_DEBUG_ERROR, ("!!! (%d) Can't allocate reordering mpdu blk\n",
		pBAEntry->list.qlen));
		#endif

		/*
		* flush all pending reordering mpdus
		* and receving mpdu to upper layer
		@@ -1610,29 +1584,11 @@ VOID Indicate_AMPDU_Packet(

		if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU) && (pRxBlk->DataSize > MAX_RX_PKT_LEN))
		{
		#if 0 // sample take off, no use
		static int err_size;

		err_size++;
		if (err_size > 20) {
		printk("AMPDU DataSize = %d\n", pRxBlk->DataSize);
		hex_dump("802.11 Header", (UCHAR *)pRxBlk->pHeader, 24);
		hex_dump("Payload", pRxBlk->pData, 64);
		err_size = 0;
		}
		#endif
		// release packet
		RELEASE_NDIS_PACKET(pAd, pRxBlk->pRxPacket, NDIS_STATUS_FAILURE);
		return;
		}


		#if 0 // test
		/* Rec BA Session had been torn down */
		INDICATE_LEGACY_OR_AMSDU(pAd, pRxBlk, FromWhichBSSID);
		return;
		#endif

		if (Wcid < MAX_LEN_OF_MAC_TABLE)
		{
		Idx = pAd->MacTab.Content[Wcid].BARecWcidArray[TID];
		@@ -1727,10 +1683,6 @@ VOID Indicate_AMPDU_Packet(
		//
		else
		{
		#if 0
		ba_refresh_reordering_mpdus(pAd, pBAEntry);
		INDICATE_LEGACY_OR_AMSDU(pAd, pRxBlk, FromWhichBSSID);
		#else
		LONG WinStartSeq, TmpSeq;


		@@ -1752,6 +1704,5 @@ VOID Indicate_AMPDU_Packet(
		{
		pBAEntry->LastIndSeq = TmpSeq;
		}
		#endif
		}
		}

drivers/staging/rt2860/common/cmm_info.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1145,11 +1145,6 @@ VOID RTMPSetPhyMode(
		INT i;
		// the selected phymode must be supported by the RF IC encoded in E2PROM

		// if no change, do nothing
		/* bug fix
		if (pAd->CommonCfg.PhyMode == phymode)
		return;
		*/
		pAd->CommonCfg.PhyMode = (UCHAR)phymode;

		DBGPRINT(RT_DEBUG_TRACE,("RTMPSetPhyMode : PhyMode=%d, channel=%d \n", pAd->CommonCfg.PhyMode, pAd->CommonCfg.Channel));
		@@ -1981,7 +1976,6 @@ INT Set_BASetup_Proc(
		=>The six 2 digit hex-decimal number previous are the Mac address,
		=>The seventh decimal number is the tid value.
		*/
		//printk("\n%s\n", arg);

		if(strlen(arg) < 19) //Mac address acceptable format 01:02:03:04:05:06 length 17 plus the "-" and tid value in decimal format.
		return FALSE;

drivers/staging/rt2860/common/dfs.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -80,18 +80,6 @@ VOID BbpRadarDetectionStart(
		RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, 124, 0x28);
		RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, 125, 0xff);

		#if 0
		// toggle Rx enable bit for radar detection.
		// it's Andy's recommand.
		{
		UINT32 Value;
		RTMP_IO_READ32(pAd, MAC_SYS_CTRL, &Value);
		Value \|= (0x1 << 3);
		RTMP_IO_WRITE32(pAd, MAC_SYS_CTRL, Value);
		Value &= ~(0x1 << 3);
		RTMP_IO_WRITE32(pAd, MAC_SYS_CTRL, Value);
		}
		#endif
		RadarPeriod = ((UINT)RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0] + (UINT)pAd->CommonCfg.RadarDetect.DfsSessionTime) < 250 ?
		(RdIdleTimeTable[pAd->CommonCfg.RadarDetect.RDDurRegion][0] + pAd->CommonCfg.RadarDetect.DfsSessionTime) : 250;