diff options
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 12 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_rx.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 3308b0d0f042..fb3cb01e67e8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c | |||
| @@ -608,7 +608,7 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv, | |||
| 608 | if (priv->rtllib->state != RTLLIB_LINKED) | 608 | if (priv->rtllib->state != RTLLIB_LINKED) |
| 609 | return ret; | 609 | return ret; |
| 610 | 610 | ||
| 611 | if ((priv->rtllib->iw_mode != IW_MODE_INFRA)) | 611 | if (priv->rtllib->iw_mode != IW_MODE_INFRA) |
| 612 | return ret; | 612 | return ret; |
| 613 | 613 | ||
| 614 | if (network->flags & NETWORK_HAS_QOS_MASK) { | 614 | if (network->flags & NETWORK_HAS_QOS_MASK) { |
| @@ -669,7 +669,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv, | |||
| 669 | if (priv->rtllib->state != RTLLIB_LINKED) | 669 | if (priv->rtllib->state != RTLLIB_LINKED) |
| 670 | return 0; | 670 | return 0; |
| 671 | 671 | ||
| 672 | if ((priv->rtllib->iw_mode != IW_MODE_INFRA)) | 672 | if (priv->rtllib->iw_mode != IW_MODE_INFRA) |
| 673 | return 0; | 673 | return 0; |
| 674 | 674 | ||
| 675 | spin_lock_irqsave(&priv->rtllib->lock, flags); | 675 | spin_lock_irqsave(&priv->rtllib->lock, flags); |
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index b26dfcbc3e3b..df4bbcf38bae 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | |||
| @@ -498,7 +498,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev) | |||
| 498 | write_nic_byte(dev, FW_Busy_Flag, 0); | 498 | write_nic_byte(dev, FW_Busy_Flag, 0); |
| 499 | return; | 499 | return; |
| 500 | } | 500 | } |
| 501 | if ((priv->rtllib->eRFPowerState != eRfOn)) { | 501 | if (priv->rtllib->eRFPowerState != eRfOn) { |
| 502 | RT_TRACE(COMP_POWER_TRACKING, | 502 | RT_TRACE(COMP_POWER_TRACKING, |
| 503 | "we are in power save, so return\n"); | 503 | "we are in power save, so return\n"); |
| 504 | write_nic_byte(dev, Pw_Track_Flag, 0); | 504 | write_nic_byte(dev, Pw_Track_Flag, 0); |
| @@ -1824,7 +1824,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( | |||
| 1824 | if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_low_thresh) && | 1824 | if ((priv->undecorated_smoothed_pwdb > dm_digtable.rssi_low_thresh) && |
| 1825 | (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_thresh)) | 1825 | (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_thresh)) |
| 1826 | return; | 1826 | return; |
| 1827 | if ((priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh)) { | 1827 | if (priv->undecorated_smoothed_pwdb <= dm_digtable.rssi_low_thresh) { |
| 1828 | if (dm_digtable.dig_state == DM_STA_DIG_OFF && | 1828 | if (dm_digtable.dig_state == DM_STA_DIG_OFF && |
| 1829 | (priv->reset_count == reset_cnt)) | 1829 | (priv->reset_count == reset_cnt)) |
| 1830 | return; | 1830 | return; |
| @@ -1850,7 +1850,7 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( | |||
| 1850 | return; | 1850 | return; |
| 1851 | } | 1851 | } |
| 1852 | 1852 | ||
| 1853 | if ((priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh)) { | 1853 | if (priv->undecorated_smoothed_pwdb >= dm_digtable.rssi_high_thresh) { |
| 1854 | u8 reset_flag = 0; | 1854 | u8 reset_flag = 0; |
| 1855 | 1855 | ||
| 1856 | if (dm_digtable.dig_state == DM_STA_DIG_ON && | 1856 | if (dm_digtable.dig_state == DM_STA_DIG_ON && |
| @@ -1998,7 +1998,7 @@ static void dm_pd_th(struct net_device *dev) | |||
| 1998 | if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT) { | 1998 | if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT) { |
| 1999 | if (dm_digtable.rssi_val >= dm_digtable.rssi_high_power_highthresh) | 1999 | if (dm_digtable.rssi_val >= dm_digtable.rssi_high_power_highthresh) |
| 2000 | dm_digtable.curpd_thstate = DIG_PD_AT_HIGH_POWER; | 2000 | dm_digtable.curpd_thstate = DIG_PD_AT_HIGH_POWER; |
| 2001 | else if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh)) | 2001 | else if (dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh) |
| 2002 | dm_digtable.curpd_thstate = DIG_PD_AT_LOW_POWER; | 2002 | dm_digtable.curpd_thstate = DIG_PD_AT_LOW_POWER; |
| 2003 | else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh) && | 2003 | else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh) && |
| 2004 | (dm_digtable.rssi_val < dm_digtable.rssi_high_power_lowthresh)) | 2004 | (dm_digtable.rssi_val < dm_digtable.rssi_high_power_lowthresh)) |
| @@ -2055,9 +2055,9 @@ static void dm_cs_ratio(struct net_device *dev) | |||
| 2055 | 2055 | ||
| 2056 | if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) { | 2056 | if (dm_digtable.PreSTAConnectState == dm_digtable.CurSTAConnectState) { |
| 2057 | if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT) { | 2057 | if (dm_digtable.CurSTAConnectState == DIG_STA_CONNECT) { |
| 2058 | if ((dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh)) | 2058 | if (dm_digtable.rssi_val <= dm_digtable.rssi_low_thresh) |
| 2059 | dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER; | 2059 | dm_digtable.curcs_ratio_state = DIG_CS_RATIO_LOWER; |
| 2060 | else if ((dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh)) | 2060 | else if (dm_digtable.rssi_val >= dm_digtable.rssi_high_thresh) |
| 2061 | dm_digtable.curcs_ratio_state = DIG_CS_RATIO_HIGHER; | 2061 | dm_digtable.curcs_ratio_state = DIG_CS_RATIO_HIGHER; |
| 2062 | else | 2062 | else |
| 2063 | dm_digtable.curcs_ratio_state = dm_digtable.precs_ratio_state; | 2063 | dm_digtable.curcs_ratio_state = dm_digtable.precs_ratio_state; |
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index e2a748bdb396..c17112396d45 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c | |||
| @@ -1166,7 +1166,7 @@ static void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast, u8 | |||
| 1166 | { | 1166 | { |
| 1167 | if (unicast) { | 1167 | if (unicast) { |
| 1168 | 1168 | ||
| 1169 | if ((ieee->state == RTLLIB_LINKED)) { | 1169 | if (ieee->state == RTLLIB_LINKED) { |
| 1170 | if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + | 1170 | if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + |
| 1171 | ieee->LinkDetectInfo.NumTxOkInPeriod) > 8) || | 1171 | ieee->LinkDetectInfo.NumTxOkInPeriod) > 8) || |
| 1172 | (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { | 1172 | (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { |
