aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se/r8185b_init.c
diff options
context:
space:
mode:
authorMaxim Mikityanskiy <maxtram95@gmail.com>2012-11-13 19:28:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-13 12:41:59 -0800
commit861437d2be466c107a7438bb7eede42c988e9137 (patch)
tree9d21eb0ce775a0968f852dcf9ab6bd03682e4f8d /drivers/staging/rtl8187se/r8185b_init.c
parentstaging: rtl8187se: Removed unneeded reads from EEPROM (diff)
downloadlinux-dev-861437d2be466c107a7438bb7eede42c988e9137.tar.xz
linux-dev-861437d2be466c107a7438bb7eede42c988e9137.zip
staging: rtl8187se: Removed unused fields in r8180_priv
Removed unused fields in r8180_priv and dead code that appeared after field removal Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8187se/r8185b_init.c')
-rw-r--r--drivers/staging/rtl8187se/r8185b_init.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c
index 06a1c0b31dc6..5c454fa861c8 100644
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
@@ -1231,11 +1231,9 @@ bool MgntActSet_RF_State(struct net_device *dev, RT_RF_POWER_STATE StateToSet, u
priv->RfOffReason = 0;
bActionAllowed = true;
- if (rtState == eRfOff && ChangeSource >= RF_CHANGE_BY_HW && !priv->bInHctTest)
+ if (rtState == eRfOff && ChangeSource >= RF_CHANGE_BY_HW)
bConnectBySSID = true;
-
- } else
- ;
+ }
break;
case eRfOff: