Commit 8875899c authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192e: Delete dead code 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 356955ae

drivers/staging/rtl8192e/r8190_rtl8256.c

+0 −9
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ SetRFPowerState8190( 


	if(priv->SetRFPowerStateInProgress == true)

		return false;

	//RT_TRACE(COMP_PS, "===========> SetRFPowerState8190()!\n");

	priv->SetRFPowerStateInProgress = true;



	switch(priv->rf_chip)
@@ -441,7 +440,6 @@ SetRFPowerState8190( 
		switch( eRFPowerState )

		{

			case eRfOn:

				//RT_TRACE(COMP_PS, "SetRFPowerState8190() eRfOn !\n");

						//RXTX enable control: On

					//for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)

					//	PHY_SetRFReg(dev, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x2);
@@ -620,7 +618,6 @@ SetRFPowerState8190( 
								break;



			case eRfOff:

				//RT_TRACE(COMP_PS, "SetRFPowerState8190() eRfOff/Sleep !\n");



				// Update current RF state variable.

				//priv->ieee80211->eRFPowerState = eRFPowerState;
@@ -718,9 +715,7 @@ SetRFPowerState8190( 
		priv->ieee80211->eRFPowerState = eRFPowerState;

	}



	//printk("%s()priv->ieee80211->eRFPowerState:%s\n" ,__func__,priv->ieee80211->eRFPowerState == eRfOn ? "On" : "Off");

	priv->SetRFPowerStateInProgress = false;

	//RT_TRACE(COMP_PS, "<=========== SetRFPowerState8190() bResult = %d!\n", bResult);

	return bResult;

}
@@ -774,8 +769,6 @@ MgntDisconnectIBSS( 
	u8			i;

	bool	bFilterOutNonAssociatedBSSID = false;



	//IEEE80211_DEBUG(IEEE80211_DL_TRACE, "XXXXXXXXXX MgntDisconnect IBSS\n");



	priv->ieee80211->state = IEEE80211_NOLINK;



//	PlatformZeroMemory( pMgntInfo->Bssid, 6 );
@@ -1003,7 +996,6 @@ MgntDisconnect( 
	{

		if( priv->ieee80211->iw_mode == IW_MODE_ADHOC )

		{

			//RT_TRACE(COMP_MLME, "MgntDisconnect() ===> MgntDisconnectIBSS\n");

			MgntDisconnectIBSS(dev);

		}

		if( priv->ieee80211->iw_mode == IW_MODE_INFRA )
@@ -1013,7 +1005,6 @@ MgntDisconnect( 
			// e.g. OID_802_11_DISASSOCIATE in Windows while as MgntDisconnectAP() is

			// used to handle disassociation related things to AP, e.g. send Disassoc

			// frame to AP.  2005.01.27, by rcnjko.

			//IEEE80211_DEBUG(IEEE80211_DL_TRACE,"MgntDisconnect() ===> MgntDisconnectAP\n");

			MgntDisconnectAP(dev, asRsn);

		}

drivers/staging/rtl8192e/r8192E_core.c

+0 −23
Original line number Diff line number Diff line
@@ -1685,7 +1685,6 @@ static void rtl8192_qos_activate(struct work_struct * work) 
				(((u32)(qos_parameters->cw_max[i]))<< AC_PARAM_ECW_MAX_OFFSET)|

				(((u32)(qos_parameters->cw_min[i]))<< AC_PARAM_ECW_MIN_OFFSET)|

				((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));

		//printk("===>u4bAcParam:%x, ", u4bAcParam);

		write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);

		//write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);

	}
@@ -3529,26 +3528,22 @@ static bool HalRxCheckStuck8190Pci(struct net_device *dev) 
	{

		if(rx_chk_cnt < 4)

		{

			//DbgPrint("RSSI < %d && RSSI >= %d, no check this time \n", RateAdaptiveTH_Low, VeryLowRSSI);

			return bStuck;

		}

		else

		{

			rx_chk_cnt = 0;

			//DbgPrint("RSSI < %d && RSSI >= %d, check this time \n", RateAdaptiveTH_Low, VeryLowRSSI);

		}

	}

	else

	{

		if(rx_chk_cnt < 8)

		{

			//DbgPrint("RSSI <= %d, no check this time \n", VeryLowRSSI);

			return bStuck;

		}

		else

		{

			rx_chk_cnt = 0;

			//DbgPrint("RSSI <= %d, check this time \n", VeryLowRSSI);

		}

	}

	if(priv->RxCounter==RegRxCounter)
@@ -4033,7 +4028,6 @@ IPSEnter(struct net_device *dev) 
			&& (priv->ieee80211->state != IEEE80211_LINKED) )

		{

			RT_TRACE(COMP_RF,"IPSEnter(): Turn off RF.\n");

			//printk("IPSEnter(): Turn off RF.\n");

			pPSC->eInactivePowerState = eRfOff;

//			queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem));

			InactivePsWorkItemCallback(dev);
@@ -4059,7 +4053,6 @@ IPSLeave(struct net_device *dev) 
		if (rtState != eRfOn  && !pPSC->bSwRfProcessing && priv->ieee80211->RfOffReason <= RF_CHANGE_BY_IPS)

		{

			RT_TRACE(COMP_POWER, "IPSLeave(): Turn on RF.\n");

			//printk("IPSLeave(): Turn on RF.\n");

			pPSC->eInactivePowerState = eRfOn;

//			queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem));

			InactivePsWorkItemCallback(dev);
@@ -4150,14 +4143,11 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) 
		return;

	hal_dm_watchdog(dev);

#ifdef ENABLE_IPS

//	printk("watch_dog ENABLE_IPS\n");

	if(ieee->actscanning == false){

		//printk("%d,%d,%d,%d\n", ieee->eRFPowerState, ieee->is_set_key, ieee->proto_stoppping, ieee->wx_set_enc);

		if((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == IEEE80211_NOLINK) &&

		    (ieee->eRFPowerState == eRfOn)&&!ieee->is_set_key &&

		    (!ieee->proto_stoppping) && !ieee->wx_set_enc){

			if(ieee->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){

				//printk("====================>haha:IPSEnter()\n");

				IPSEnter(dev);

				//ieee80211_stop_scan(priv->ieee80211);

			}
@@ -4177,8 +4167,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) 
			if(	((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + ieee->LinkDetectInfo.NumTxOkInPeriod) > 8 ) ||

				(ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )

			{

				//printk("ieee->LinkDetectInfo.NumRxUnicastOkInPeriod is %d,ieee->LinkDetectInfo.NumTxOkInPeriod is %d\n",

				//	ieee->LinkDetectInfo.NumRxUnicastOkInPeriod,ieee->LinkDetectInfo.NumTxOkInPeriod);

				bEnterPS= false;

			}

			else
@@ -4186,7 +4174,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) 
				bEnterPS= true;

			}



			//printk("***bEnterPS = %d\n", bEnterPS);

			// LeisurePS only work in infra mode.

			if(bEnterPS)

			{
@@ -4248,7 +4235,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) 
	{

    		ResetType = rtl819x_ifcheck_resetornot(dev);

		check_reset_cnt = 3;

		//DbgPrint("Start to check silent reset\n");

	}

	spin_unlock_irqrestore(&priv->tx_lock,flags);

	if(!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL)
@@ -4784,7 +4770,6 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct 
			if(priv->stats.rx_rssi_percentage[rfpath] == 0)

			{

				priv->stats.rx_rssi_percentage[rfpath] = pprevious_stats->RxMIMOSignalStrength[rfpath];

				//DbgPrint("MIMO RSSI initialize \n");

			}

			if(pprevious_stats->RxMIMOSignalStrength[rfpath]  > priv->stats.rx_rssi_percentage[rfpath])

			{
@@ -4816,12 +4801,10 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct 
			slide_beacon_adc_pwdb_statistics = PHY_Beacon_RSSI_SLID_WIN_MAX;

			last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index];

			priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb;

			//DbgPrint("slide_beacon_adc_pwdb_index = %d, last_beacon_adc_pwdb = %d, Adapter->RxStats.Slide_Beacon_Total = %d\n",

			//	slide_beacon_adc_pwdb_index, last_beacon_adc_pwdb, Adapter->RxStats.Slide_Beacon_Total);

		}

		priv->stats.Slide_Beacon_Total += pprevious_stats->RxPWDBAll;

		priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] = pprevious_stats->RxPWDBAll;

		//DbgPrint("slide_beacon_adc_pwdb_index = %d, pPreviousRfd->Status.RxPWDBAll = %d\n", slide_beacon_adc_pwdb_index, pPreviousRfd->Status.RxPWDBAll);

		slide_beacon_adc_pwdb_index++;

		if(slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX)

			slide_beacon_adc_pwdb_index = 0;
@@ -4839,7 +4822,6 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct 
		if(priv->undecorated_smoothed_pwdb < 0)	// initialize

		{

			priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll;

			//DbgPrint("First pwdb initialize \n");

		}

#if 1

		if(pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb)
@@ -5094,7 +5076,6 @@ static void rtl8192_query_rxphystatus( 
				cck_adc_pwdb[i] = (char)tmp_pwdb;

				cck_adc_pwdb[i] /= 2;

				pstats->cck_adc_pwdb[i] = precord_stats->cck_adc_pwdb[i] = cck_adc_pwdb[i];

				//DbgPrint("RF-%d tmp_pwdb = 0x%x, cck_adc_pwdb = %d", i, tmp_pwdb, cck_adc_pwdb[i]);

			}

		}

#endif
@@ -5323,13 +5304,11 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev, 
    if(WLAN_FC_GET_FRAMETYPE(fc)== IEEE80211_STYPE_BEACON)

    {

        bPacketBeacon = true;

        //DbgPrint("Beacon 2, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf);

    }

    if(WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK)

    {

        if((!compare_ether_addr(praddr,dev->dev_addr)))

            bToSelfBA = true;

        //DbgPrint("BlockAck, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf);

    }



#endif
@@ -6103,7 +6082,6 @@ void setKey( struct net_device *dev, 


			write_nic_dword(dev, WCAMI, TargetContent);

			write_nic_dword(dev, RWCAM, TargetCommand);

	//		printk("setkey cam =%8x\n", read_cam(dev, i+6*EntryNo));

		}

		else if(i==1){//MAC

                        TargetContent = (u32)(*(MacAddr+2)) 	 |
@@ -6147,7 +6125,6 @@ bool NicIFEnableNIC(struct net_device* dev) 
		priv->bdisable_nic = false;  //YJ,add,091111

		return -1;

	}

	//printk("start adapter finished\n");

	RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC);

	//priv->bfirst_init = false;

drivers/staging/rtl8192e/r8192E_dm.c

+5 −57
Original line number Diff line number Diff line
@@ -406,20 +406,16 @@ static void dm_check_rate_adaptive(struct net_device * dev) 
					(pra->low_rssi_thresh_for_ra40M):(pra->low_rssi_thresh_for_ra20M);

		}



		//DbgPrint("[DM] Thresh H/L=%d/%d\n\r", RATR.HighRSSIThreshForRA, RATR.LowRSSIThreshForRA);

		if(priv->undecorated_smoothed_pwdb >= (long)HighRSSIThreshForRA)

		{

			//DbgPrint("[DM] RSSI=%d STA=HIGH\n\r", pHalData->UndecoratedSmoothedPWDB);

			pra->ratr_state = DM_RATR_STA_HIGH;

			targetRATR = pra->upper_rssi_threshold_ratr;

		}else if(priv->undecorated_smoothed_pwdb >= (long)LowRSSIThreshForRA)

		{

			//DbgPrint("[DM] RSSI=%d STA=Middle\n\r", pHalData->UndecoratedSmoothedPWDB);

			pra->ratr_state = DM_RATR_STA_MIDDLE;

			targetRATR = pra->middle_rssi_threshold_ratr;

		}else

		{

			//DbgPrint("[DM] RSSI=%d STA=LOW\n\r", pHalData->UndecoratedSmoothedPWDB);

			pra->ratr_state = DM_RATR_STA_LOW;

			targetRATR = pra->low_rssi_threshold_ratr;

		}
@@ -433,17 +429,13 @@ static void dm_check_rate_adaptive(struct net_device * dev) 
				if( (priv->undecorated_smoothed_pwdb < (long)pra->ping_rssi_thresh_for_ra) ||

					ping_rssi_state )

				{

					//DbgPrint("TestRSSI = %d, set RATR to 0x%x \n", pHalData->UndecoratedSmoothedPWDB, pRA->TestRSSIRATR);

					pra->ratr_state = DM_RATR_STA_LOW;

					targetRATR = pra->ping_rssi_ratr;

					ping_rssi_state = 1;

				}

				//else

				//	DbgPrint("TestRSSI is between the range. \n");

			}

			else

			{

				//DbgPrint("TestRSSI Recover to 0x%x \n", targetRATR);

				ping_rssi_state = 0;

			}

		}
@@ -616,7 +608,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device * dev) 
	cmpk_message_handle_tx(dev, (u8*)&tx_cmd, DESC_PACKET_TYPE_INIT, sizeof(DCMD_TXCMD_T));

#endif

	mdelay(1);

	//DbgPrint("hi, vivi, strange\n");



	for(i = 0;i <= 30; i++)

	{

		Pwr_Flag = read_nic_byte(dev, Pw_Track_Flag);
@@ -910,9 +902,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) 
			tmpOFDMindex = tmpCCK20Mindex = 6 - tmpval;

		tmpCCK40Mindex = 0;

	}

	//DbgPrint("%ddb, tmpOFDMindex = %d, tmpCCK20Mindex = %d, tmpCCK40Mindex = %d",

		//((u1Byte)tmpRegA - pHalData->ThermalMeter[0]),

		//tmpOFDMindex, tmpCCK20Mindex, tmpCCK40Mindex);



	if(priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)	//40M

		tmpCCKindex = tmpCCK40Mindex;

	else
@@ -943,7 +933,6 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) 


	if(CCKSwingNeedUpdate)

	{

		//DbgPrint("Update CCK Swing, CCK_index = %d\n", pHalData->CCK_index);

		dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);

	}

	if(priv->OFDM_index != tmpOFDMindex)
@@ -1143,7 +1132,6 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) 
	struct r8192_priv *priv = ieee80211_priv(dev);

	static u8 	TM_Trigger=0;



	//DbgPrint("dm_CheckTXPowerTracking() \n");

	if(!priv->btxpower_tracking)

		return;

	else
@@ -1159,7 +1147,6 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) 
	{

		//Attention!! You have to wirte all 12bits data to RF, or it may cause RF to crash

		//actually write reg0x02 bit1=0, then bit1=1.

		//DbgPrint("Trigger ThermalMeter, write RF reg0x2 = 0x4d to 0x4f\n");

		rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);

		rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4f);

		rtl8192_phy_SetRFReg(dev, RF90_PATH_A, 0x02, bMask12Bits, 0x4d);
@@ -1168,7 +1155,6 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) 
		return;

	}

	else {

		//DbgPrint("Schedule TxPowerTrackingWorkItem\n");

		queue_delayed_work(priv->priv_wq,&priv->txpower_tracking_wq,0);

		TM_Trigger = 0;

	}
@@ -1373,10 +1359,7 @@ void dm_restore_dynamic_mechanism_state(struct net_device *dev) 
			if(priv->rf_type == RF_1T2R)	// 1T2R, Spatial Stream 2 should be disabled

			{

				ratr_value &=~ (RATE_ALL_OFDM_2SS);

				//DbgPrint("HW_VAR_TATR_0 from 0x%x ==> 0x%x\n", ((pu4Byte)(val))[0], ratr_value);

			}

			//DbgPrint("set HW_VAR_TATR_0 = 0x%x\n", ratr_value);

			//cosa PlatformEFIOWrite4Byte(Adapter, RATR0, ((pu4Byte)(val))[0]);

			write_nic_dword(dev, RATR0, ratr_value);

			write_nic_byte(dev, UFWP, 1);

	}
@@ -1591,7 +1574,6 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi( 
	if (dm_digtable.dig_enable_flag == false)

		return;



	//DbgPrint("Dig by Sw Rssi \n");

	if(dm_digtable.dig_algorithm_switch)	// if swithed algorithm, we have to disable FW Dig.

		fw_dig = 0;

	if(fw_dig <= 3)	// execute several times to make sure the FW Dig is disabled
@@ -1607,12 +1589,9 @@ static void dm_ctrl_initgain_byrssi_by_driverrssi( 
	else

		dm_digtable.cur_connect_state = DIG_DISCONNECT;



	//DbgPrint("DM_DigTable.PreConnectState = %d, DM_DigTable.CurConnectState = %d \n",

		//DM_DigTable.PreConnectState, DM_DigTable.CurConnectState);



	if(dm_digtable.dbg_mode == DM_DBG_OFF)

		dm_digtable.rssi_val = priv->undecorated_smoothed_pwdb;

	//DbgPrint("DM_DigTable.Rssi_val = %d \n", DM_DigTable.Rssi_val);



	dm_initial_gain(dev);

	dm_pd_th(dev);

	dm_cs_ratio(dev);
@@ -1650,11 +1629,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( 
	{

		return;

	}

	//DbgPrint("Dig by Fw False Alarm\n");

	//if (DM_DigTable.Dig_State == DM_STA_DIG_OFF)

	/*DbgPrint("DIG Check\n\r RSSI=%d LOW=%d HIGH=%d STATE=%d",

	pHalData->UndecoratedSmoothedPWDB, DM_DigTable.RssiLowThresh,

	DM_DigTable.RssiHighThresh, DM_DigTable.Dig_State);*/



	/* 1. When RSSI decrease, We have to judge if it is smaller than a threshold

		  and then execute below step. */

	if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh))
@@ -1736,7 +1711,6 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( 
		}



		dm_digtable.dig_state = DM_STA_DIG_ON;

		//DbgPrint("DIG ON\n\r");



		// 2.1 Set initial gain.

		// 2008/02/26 MH SD3-Jerry suggest to prevent dirty environment.
@@ -1906,7 +1880,6 @@ static void dm_initial_gain( 
		dm_digtable.cur_ig_value = priv->DefaultInitialGain[0];

		dm_digtable.pre_ig_value = 0;

	}

	//DbgPrint("DM_DigTable.CurIGValue = 0x%x, DM_DigTable.PreIGValue = 0x%x\n", DM_DigTable.CurIGValue, DM_DigTable.PreIGValue);



	// if silent reset happened, we should rewrite the values back

	if(priv->reset_count != reset_cnt)
@@ -1923,7 +1896,6 @@ static void dm_initial_gain( 
			|| !initialized || force_write)

		{

			initial_gain = (u8)dm_digtable.cur_ig_value;

			//DbgPrint("Write initial gain = 0x%x\n", initial_gain);

			// Set initial gain.

			write_nic_byte(dev, rOFDM0_XAAGCCore1, initial_gain);

			write_nic_byte(dev, rOFDM0_XBAGCCore1, initial_gain);
@@ -1984,7 +1956,6 @@ static void dm_pd_th( 
		if((dm_digtable.prepd_thstate != dm_digtable.curpd_thstate) ||

			(initialized<=3) || force_write)

		{

			//DbgPrint("Write PD_TH state = %d\n", DM_DigTable.CurPD_THState);

			if(dm_digtable.curpd_thstate == DIG_PD_AT_LOW_POWER)

			{

				// Lower PD_TH for OFDM.
@@ -2093,7 +2064,6 @@ static void dm_cs_ratio( 
	if((dm_digtable.precs_ratio_state != dm_digtable.curcs_ratio_state) ||

		!initialized || force_write)

	{

		//DbgPrint("Write CS_ratio state = %d\n", DM_DigTable.CurCS_ratioState);

		if(dm_digtable.curcs_ratio_state == DIG_CS_RATIO_LOWER)

		{

			// Lower CS ratio for CCK.
@@ -2145,7 +2115,6 @@ static void dm_check_edca_turbo( 
	if(priv->ieee80211->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO)

		goto dm_CheckEdcaTurbo_EXIT;



//	printk("========>%s():bis_any_nonbepkts is %d\n",__FUNCTION__,priv->bis_any_nonbepkts);

	// Check the status for current condition.

	if(!priv->ieee80211->bis_any_nonbepkts)

	{
@@ -2154,7 +2123,6 @@ static void dm_check_edca_turbo( 
		// For RT-AP, we needs to turn it on when Rx>Tx

		if(curRxOkCnt > 4*curTxOkCnt)

		{

			//printk("%s():curRxOkCnt > 4*curTxOkCnt\n");

			if(!priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA)

			{

				write_nic_dword(dev, EDCAPARA_BE, edca_setting_DL[pHTInfo->IOTPeer]);
@@ -2163,8 +2131,6 @@ static void dm_check_edca_turbo( 
		}

		else

		{



			//printk("%s():curRxOkCnt < 4*curTxOkCnt\n");

			if(priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA)

			{

				write_nic_dword(dev, EDCAPARA_BE, edca_setting_UL[pHTInfo->IOTPeer]);
@@ -2269,7 +2235,6 @@ static void dm_ctstoself(struct net_device *dev) 
		if(curRxOkCnt > 4*curTxOkCnt)	//downlink, disable CTS to self

		{

			pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;

			//DbgPrint("dm_CTSToSelf() ==> CTS to self disabled -- downlink\n");

		}

		else	//uplink

		{
@@ -2279,12 +2244,10 @@ static void dm_ctstoself(struct net_device *dev) 
			if(priv->undecorated_smoothed_pwdb < priv->ieee80211->CTSToSelfTH)	// disable CTS to self

			{

				pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;

				//DbgPrint("dm_CTSToSelf() ==> CTS to self disabled\n");

			}

			else if(priv->undecorated_smoothed_pwdb >= (priv->ieee80211->CTSToSelfTH+5))	// enable CTS to self

			{

				pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF;

				//DbgPrint("dm_CTSToSelf() ==> CTS to self enabled\n");

			}

		#endif

		}
@@ -2467,7 +2430,6 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev) 
	if(priv->ieee80211->mode == WIRELESS_MODE_B)

	{

		DM_RxPathSelTable.cck_method = CCK_Rx_Version_2;	//pure B mode, fixed cck version2

		//DbgPrint("Pure B mode, use cck rx version2 \n");

	}



	//decide max/sec/min rssi index
@@ -2689,7 +2651,6 @@ static void dm_rxpath_sel_byrssi(struct net_device * dev) 
				if(tmp_max_rssi >= DM_RxPathSelTable.rf_enable_rssi_th[i])

				{

					//enable the BB Rx path

					//DbgPrint("RF-%d is enabled. \n", 0x1<<i);

					rtl8192_setBBreg(dev, rOFDM0_TRxPathEnable, 0x1<<i, 0x1);	// 0xc04[3:0]

					rtl8192_setBBreg(dev, rOFDM1_TRxPathEnable, 0x1<<i, 0x1);	// 0xd04[3:0]

					DM_RxPathSelTable.rf_enable_rssi_th[i] = 100;
@@ -3053,12 +3014,6 @@ void dm_check_fsync(struct net_device *dev) 
						#endif



						reg_c38_State = RegC38_NonFsync_Other_AP;

					#if 0//cosa

						if (Adapter->HardwareType == HARDWARE_TYPE_RTL8190P)

							DbgPrint("Fsync is idle, rssi<=35, write 0xc38 = 0x%x \n", 0x10);

						else

							DbgPrint("Fsync is idle, rssi<=35, write 0xc38 = 0x%x \n", 0x90);

					#endif

					}

				}

				else if(priv->undecorated_smoothed_pwdb >= (RegC38_TH+5))
@@ -3067,7 +3022,6 @@ void dm_check_fsync(struct net_device *dev) 
					{

						write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync);

						reg_c38_State = RegC38_Default;

						//DbgPrint("Fsync is idle, rssi>=40, write 0xc38 = 0x%x \n", pHalData->framesync);

					}

				}

			}
@@ -3077,7 +3031,6 @@ void dm_check_fsync(struct net_device *dev) 
				{

					write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync);

					reg_c38_State = RegC38_Default;

					//DbgPrint("Fsync is idle, not connected, write 0xc38 = 0x%x \n", pHalData->framesync);

				}

			}

		}
@@ -3089,7 +3042,6 @@ void dm_check_fsync(struct net_device *dev) 
			write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync);

			reg_c38_State = RegC38_Default;

			reset_cnt = priv->reset_count;

			//DbgPrint("reg_c38_State = 0 for silent reset. \n");

		}

	}

	else
@@ -3098,7 +3050,6 @@ void dm_check_fsync(struct net_device *dev) 
		{

			write_nic_byte(dev, rOFDM0_RxDetector3, priv->framesync);

			reg_c38_State = RegC38_Default;

			//DbgPrint("framesync no monitor, write 0xc38 = 0x%x \n", pHalData->framesync);

		}

	}

}
@@ -3130,7 +3081,6 @@ static void dm_dynamic_txpower(struct net_device *dev) 
		priv->bDynamicTxLowPower = false;

		return;

	}

	//printk("priv->ieee80211->current_network.unknown_cap_exist is %d ,priv->ieee80211->current_network.broadcom_cap_exist is %d\n",priv->ieee80211->current_network.unknown_cap_exist,priv->ieee80211->current_network.broadcom_cap_exist);

        if((priv->ieee80211->current_network.atheros_cap_exist ) && (priv->ieee80211->mode == IEEE_G)){

		txhipower_threshhold = TX_POWER_ATHEROAP_THRESH_HIGH;

		txlowpower_threshold = TX_POWER_ATHEROAP_THRESH_LOW;
@@ -3141,8 +3091,6 @@ static void dm_dynamic_txpower(struct net_device *dev) 
		txlowpower_threshold = TX_POWER_NEAR_FIELD_THRESH_LOW;

	}



//	printk("=======>%s(): txhipower_threshhold is %d,txlowpower_threshold is %d\n",__FUNCTION__,txhipower_threshhold,txlowpower_threshold);



	RT_TRACE(COMP_TXAGC,"priv->undecorated_smoothed_pwdb = %ld \n" , priv->undecorated_smoothed_pwdb);



	if(priv->ieee80211->state == IEEE80211_LINKED)