mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 12:53:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8192e: Remove dead code from MgntActSet_RF_State

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack
2011-02-06 22:56:57 +09:00
committed by Greg Kroah-Hartman
parent 6f304eb291
commit ea66f752c0
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/staging/rtl8192e/r8190_rtl8256.c
View File

@@ -812,11 +812,6 @@ MgntActSet_RF_State(
switch(StateToSet)
{
case eRfOn:
//
// Turn On RF no matter the IPS setting because we need to update the RF state to Ndis under Vista, or
// the Windows does not allow the driver to perform site survey any more. By Bruce, 2007-10-02.
//
priv->ieee80211->RfOffReason &= (~ChangeSource);
if(! priv->ieee80211->RfOffReason)
@@ -837,21 +832,11 @@ MgntActSet_RF_State(
case eRfOff:
if (priv->ieee80211->RfOffReason > RF_CHANGE_BY_IPS)
{
//
// 060808, Annie:
// Disconnect to current BSS when radio off. Asked by QuanTa.
//
// Set all link status falg, by Bruce, 2007-06-26.
//MgntActSet_802_11_DISASSOCIATE( Adapter, disas_lv_ss );
MgntDisconnect(dev, disas_lv_ss);
// Clear content of bssDesc[] and bssDesc4Query[] to avoid reporting old bss to UI.
// 2007.05.28, by shien chang.
}
if (priv->ieee80211->RfOffReason > RF_CHANGE_BY_IPS)
{
// Disconnect to current BSS when radio off. Asked by QuanTa.
MgntDisconnect(dev, disas_lv_ss);
}
priv->ieee80211->RfOffReason |= ChangeSource;
bActionAllowed = true;
@@ -861,30 +846,13 @@ MgntActSet_RF_State(
priv->ieee80211->RfOffReason |= ChangeSource;
bActionAllowed = true;
break;
default:
break;
}
if(bActionAllowed)
if (bActionAllowed)
{
RT_TRACE(COMP_POWER, "MgntActSet_RF_State(): Action is allowed.... StateToSet(%d), RfOffReason(%#X)\n", StateToSet, priv->ieee80211->RfOffReason);
// Config HW to the specified mode.
// Config HW to the specified mode.
SetRFPowerState(dev, StateToSet);
// Turn on RF.
if(StateToSet == eRfOn)
{
//Adapter->HalFunc.HalEnableRxHandler(Adapter);
if(bConnectBySSID)
{
//MgntActSet_802_11_SSID(Adapter, Adapter->MgntInfo.Ssid.Octet, Adapter->MgntInfo.Ssid.Length, TRUE );
}
}
// Turn off RF.
else if(StateToSet == eRfOff)
{
//Adapter->HalFunc.HalDisableRxHandler(Adapter);
}
}
else
{