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

Staging: rtxxx0: debug messages fixes 



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

drivers/staging/rt2860/common/ba_action.c

+0 −7
Original line number Diff line number Diff line
@@ -531,12 +531,10 @@ VOID BAOriSessionSetUp( 
	pBAEntry->TimeOutValue = TimeOut;

	pBAEntry->pAdapter = pAd;



#ifdef RT30xx

	DBGPRINT(RT_DEBUG_TRACE,("Send AddBA to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d isForced:%d Wcid:%d\n"

		,pEntry->Addr[0],pEntry->Addr[1],pEntry->Addr[2]

		,pEntry->Addr[3],pEntry->Addr[4],pEntry->Addr[5]

		,TID,isForced,pEntry->Aid));

#endif



	if (!(pEntry->TXBAbitmap & (1<<TID)))

	{
@@ -1078,16 +1076,11 @@ VOID BAOriSessionSetupTimeout( 
		AddbaReq.Token = pBAEntry->Token;

		MlmeEnqueue(pAd, ACTION_STATE_MACHINE, MT2_MLME_ADD_BA_CATE, sizeof(MLME_ADDBA_REQ_STRUCT), (PVOID)&AddbaReq);

		RT28XX_MLME_HANDLER(pAd);

#ifndef RT30xx

		DBGPRINT(RT_DEBUG_TRACE,("BA Ori Session Timeout(%d) : Send ADD BA again\n", pBAEntry->Token));

#endif

#ifdef RT30xx

		DBGPRINT(RT_DEBUG_TRACE,("BA Ori Session Timeout(%d) to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d Wcid:%d\n"

		,pBAEntry->Token

		,pEntry->Addr[0],pEntry->Addr[1],pEntry->Addr[2]

		,pEntry->Addr[3],pEntry->Addr[4],pEntry->Addr[5]

		,pBAEntry->TID,pEntry->Aid));

#endif

		pBAEntry->Token++;

		RTMPSetTimer(&pBAEntry->ORIBATimer, ORI_BA_SESSION_TIMEOUT);

	}

drivers/staging/rt2860/common/mlme.c

+1 −13
Original line number Diff line number Diff line
@@ -2813,9 +2813,8 @@ VOID MlmeSetPsmBit( 
	RTMP_IO_READ32(pAd, AUTO_RSP_CFG, &csr4.word);

	csr4.field.AckCtsPsmBit = (psm == PWR_SAVE)? 1:0;

	RTMP_IO_WRITE32(pAd, AUTO_RSP_CFG, csr4.word);

#ifndef RT30xx



	DBGPRINT(RT_DEBUG_TRACE, ("MlmeSetPsmBit = %d\n", psm));

#endif

}



// IRQL = DISPATCH_LEVEL
@@ -5806,14 +5805,7 @@ VOID AsicSwitchChannel( 
#endif



	if (index == MAX_NUM_OF_CHANNELS)

	{

#ifndef RT30xx

		DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Cant find the Channel#%d \n", Channel));

#endif

#ifdef RT30xx

		DBGPRINT(RT_DEBUG_ERROR, ("AsicSwitchChannel: Can't find the Channel#%d \n", Channel));

#endif

	}



#ifdef RT2870

	// The RF programming sequence is difference between 3xxx and 2xxx
@@ -5935,7 +5927,6 @@ VOID AsicSwitchChannel( 
			}

		}



#ifndef RT30xx

		DBGPRINT(RT_DEBUG_TRACE, ("SwitchChannel#%d(RF=%d, Pwr0=%d, Pwr1=%d, %dT), N=0x%02X, K=0x%02X, R=0x%02X\n",

			Channel,

			pAd->RfIcType,
@@ -5945,7 +5936,6 @@ VOID AsicSwitchChannel( 
			FreqItems3020[index].N,

			FreqItems3020[index].K,

			FreqItems3020[index].R));

#endif

	}

	else

#endif // RT2870 //
@@ -9075,11 +9065,9 @@ VOID AsicTurnOnRFClk( 
			break;

	}



#ifndef RT30xx

	DBGPRINT(RT_DEBUG_TRACE, ("AsicTurnOnRFClk#%d(RF=%d, ) , R2=0x%08x\n",

		Channel,

		pAd->RfIcType,

		R2));

#endif

}

drivers/staging/rt2860/common/spectrum.c

+0 −5
Original line number Diff line number Diff line
@@ -1570,12 +1570,7 @@ static VOID PeerMeasureReportAction( 


	if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL)

	{

#ifndef RT30xx

		DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%zu).\n", __func__, sizeof(MEASURE_RPI_REPORT)));

#endif

#ifdef RT30xx

		DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __func__, sizeof(MEASURE_RPI_REPORT)));

#endif

		return;

	}

drivers/staging/rt2860/rt_linux.c

+0 −5
Original line number Diff line number Diff line
@@ -826,12 +826,7 @@ void send_monitor_packets( 


    if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE)

    {

#ifndef RT30xx

        DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%zu)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));

#endif

#ifdef RT30xx

        DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));

#endif

		goto err_free_sk_buff;

    }

drivers/staging/rt2860/sta/sync.c

+0 −2
Original line number Diff line number Diff line
@@ -1116,10 +1116,8 @@ VOID PeerBeacon( 
			// Add the safeguard against the mismatch of adhoc wep status

			if (pAd->StaCfg.WepStatus != pAd->ScanTab.BssEntry[Bssidx].WepStatus)

			{

#ifdef RT30xx

				DBGPRINT(RT_DEBUG_TRACE, ("SYNC - Not matched wep status %d %d\n", pAd->StaCfg.WepStatus, pAd->ScanTab.BssEntry[Bssidx].WepStatus));

				DBGPRINT(RT_DEBUG_TRACE, ("bssid=%s\n", pAd->ScanTab.BssEntry[Bssidx].Bssid));

#endif

				return;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE