diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-02-04 05:28:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-07 04:37:52 -0500 |
commit | e914024d46e3de3c5c3ce9c5b77b564ad6a264c0 (patch) | |
tree | d5a40a7c9530516c220178768d827a6dfedd1242 | |
parent | 3d272700d73c6503138759c1de6021ee4466e4d8 (diff) |
staging: rtl8188eu: odm: conditional setting with no effect
The if and the else branch code are identical - so the condition has no
effect on the effective code - this patch removes the condition and the
duplicated code. Due to this being a fall-through-if here - the first
if condition has no effect either - so it also can be removed.
struct mlme_priv is thus also no longer needed here.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/rtl8188eu/hal/odm.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c index 878c460f846c..06477e834653 100644 --- a/drivers/staging/rtl8188eu/hal/odm.c +++ b/drivers/staging/rtl8188eu/hal/odm.c | |||
@@ -1133,16 +1133,9 @@ static void FindMinimumRSSI(struct adapter *pAdapter) | |||
1133 | { | 1133 | { |
1134 | struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); | 1134 | struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); |
1135 | struct dm_priv *pdmpriv = &pHalData->dmpriv; | 1135 | struct dm_priv *pdmpriv = &pHalData->dmpriv; |
1136 | struct mlme_priv *pmlmepriv = &pAdapter->mlmepriv; | 1136 | |
1137 | 1137 | /* 1 1.Unconditionally set RSSI */ | |
1138 | /* 1 1.Determine the minimum RSSI */ | 1138 | pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; |
1139 | if ((check_fwstate(pmlmepriv, _FW_LINKED) == false) && | ||
1140 | (pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) | ||
1141 | pdmpriv->MinUndecoratedPWDBForDM = 0; | ||
1142 | if (check_fwstate(pmlmepriv, _FW_LINKED) == true) /* Default port */ | ||
1143 | pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; | ||
1144 | else /* associated entry pwdb */ | ||
1145 | pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB; | ||
1146 | } | 1139 | } |
1147 | 1140 | ||
1148 | void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm) | 1141 | void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm) |