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

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

Staging: rtl8192su: remove RTL8192S_DISABLE_FW_DM ifdefs 



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

drivers/staging/rtl8192su/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 
EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE

EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1



EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0

EXTRA_CFLAGS += -DDISABLE_BB_RF=0

EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0

EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0

drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c

+0 −4
Original line number Diff line number Diff line
@@ -330,13 +330,11 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work) 
#ifndef RTL8192SE

	ieee->InitialGainHandler(ieee->dev,IG_Backup);

#endif

#if(RTL8192S_DISABLE_FW_DM == 0)

	if (ieee->SetFwCmdHandler)

	{

		ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_HALT);

		ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_DISABLE);

	}

#endif

	if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) {

		b40M = 1;

		chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
@@ -361,13 +359,11 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work) 
#ifndef RTL8192SE

	ieee->InitialGainHandler(ieee->dev,IG_Restore);

#endif

#if(RTL8192S_DISABLE_FW_DM == 0)

	if (ieee->SetFwCmdHandler)

	{

		ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_RESUME);

		ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_ENABLE);

	}

#endif

	ieee->state = IEEE80211_LINKED;

	ieee->link_change(ieee->dev);

	// To prevent the immediately calling watch_dog after scan.

drivers/staging/rtl8192su/r8192S_phy.c

+0 −2
Original line number Diff line number Diff line
@@ -3074,7 +3074,6 @@ PHY_ScanOperationBackup8192S( 






#if(RTL8192S_DISABLE_FW_DM == 0)



	if(!Adapter->bDriverStopped)

	{
@@ -3103,7 +3102,6 @@ PHY_ScanOperationBackup8192S( 
				break;

		}

	}

#endif

}

#endif

drivers/staging/rtl8192su/r8192U_core.c

+0 −3
Original line number Diff line number Diff line
@@ -7014,9 +7014,6 @@ bool rtl8192SU_adapter_start(struct net_device *dev) 
	//

	rtl8192SU_MacConfigAfterFwDownload(dev);



#if (RTL8192S_DISABLE_FW_DM == 1)

	write_nic_dword(dev, WFM5, FW_DM_DISABLE);

#endif

	//priv->bLbusEnable = TRUE;

	//if(priv->RegRfOff == TRUE)

	//	priv->eRFPowerState = eRfOff;