lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: rtl8192su: remove RTL8192S_DISABLE_FW_DM ifdefs

Browse Source 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-07-03 16:07:00 +02:00
committed by Greg Kroah-Hartman
parent f063ba768e
commit b8bd14b912
4 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8192su/Makefile
View File

@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1
EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE
EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1 EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1
EXTRA_CFLAGS += -DRTL8192S_DISABLE_FW_DM=0
EXTRA_CFLAGS += -DDISABLE_BB_RF=0 EXTRA_CFLAGS += -DDISABLE_BB_RF=0
EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0 EXTRA_CFLAGS += -DRTL8192SU_USE_PARAM_TXPWR=0
EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0 EXTRA_CFLAGS += -DRTL8192SU_FPGA_UNSPECIFIED_NETWORK=0

4
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c
View File

@@ -330,13 +330,11 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
#ifndef RTL8192SE #ifndef RTL8192SE
ieee->InitialGainHandler(ieee->dev,IG_Backup); ieee->InitialGainHandler(ieee->dev,IG_Backup);
#endif #endif
#if(RTL8192S_DISABLE_FW_DM == 0)
if (ieee->SetFwCmdHandler) if (ieee->SetFwCmdHandler)
{ {
ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_HALT); ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_HALT);
ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_DISABLE); ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_DISABLE);
} }
#endif
if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) { if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && ieee->pHTInfo->bCurBW40MHz) {
b40M = 1; b40M = 1;
chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset; chan_offset = ieee->pHTInfo->CurSTAExtChnlOffset;
@@ -361,13 +359,11 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
#ifndef RTL8192SE #ifndef RTL8192SE
ieee->InitialGainHandler(ieee->dev,IG_Restore); ieee->InitialGainHandler(ieee->dev,IG_Restore);
#endif #endif
#if(RTL8192S_DISABLE_FW_DM == 0)
if (ieee->SetFwCmdHandler) if (ieee->SetFwCmdHandler)
{ {
ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_RESUME); ieee->SetFwCmdHandler(ieee->dev, FW_CMD_DIG_RESUME);
ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_ENABLE); ieee->SetFwCmdHandler(ieee->dev, FW_CMD_HIGH_PWR_ENABLE);
} }
#endif
ieee->state = IEEE80211_LINKED; ieee->state = IEEE80211_LINKED;
ieee->link_change(ieee->dev); ieee->link_change(ieee->dev);
// To prevent the immediately calling watch_dog after scan. // To prevent the immediately calling watch_dog after scan.

2
drivers/staging/rtl8192su/r8192S_phy.c
View File

@@ -3074,7 +3074,6 @@ PHY_ScanOperationBackup8192S(
#if(RTL8192S_DISABLE_FW_DM == 0)
if(!Adapter->bDriverStopped) if(!Adapter->bDriverStopped)
{ {
@@ -3103,7 +3102,6 @@ PHY_ScanOperationBackup8192S(
break; break;
} }
} }
#endif
} }
#endif #endif

3
drivers/staging/rtl8192su/r8192U_core.c
View File

@@ -7014,9 +7014,6 @@ start:
// //
rtl8192SU_MacConfigAfterFwDownload(dev); rtl8192SU_MacConfigAfterFwDownload(dev);
#if (RTL8192S_DISABLE_FW_DM == 1)
write_nic_dword(dev, WFM5, FW_DM_DISABLE);
#endif
//priv->bLbusEnable = TRUE; //priv->bLbusEnable = TRUE;
//if(priv->RegRfOff == TRUE) //if(priv->RegRfOff == TRUE)
// priv->eRFPowerState = eRfOff; // priv->eRFPowerState = eRfOff;