[PATCH 06/63] staging: r8188eu: remove in_cta_test member of struct adapter

[Ivan Safonov]

bNotifyChannelChange does not changed after initialization.
"if" branches with in_cta_test != 0 removed too.

Signed-off-by: Ivan Safonov <insafo...@gmail.com>
---
 drivers/staging/rtl8188eu/hal/usb_halinit.c   | 21 +++------------------
 drivers/staging/rtl8188eu/include/drv_types.h |  2 --
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c 
b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 363f3a3..03c143f 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1426,17 +1426,8 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 
variable, u8 *val)
                                /* enable update TSF */
                                usb_write8(Adapter, REG_BCN_CTRL, 
usb_read8(Adapter, REG_BCN_CTRL)&(~BIT(4)));
                        }
-                       if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
-                               usb_write32(Adapter, REG_RCR, 
usb_read32(Adapter, REG_RCR)|RCR_CBSSID_BCN);
-                       } else {
-                               if (Adapter->in_cta_test) {
-                                       u32 v = usb_read32(Adapter, REG_RCR);
-                                       v &= ~(RCR_CBSSID_DATA | 
RCR_CBSSID_BCN);/*  RCR_ADF */
-                                       usb_write32(Adapter, REG_RCR, v);
-                               } else {
-                                       usb_write32(Adapter, REG_RCR, 
usb_read32(Adapter, REG_RCR)|RCR_CBSSID_BCN);
-                               }
-                       }
+
+                       usb_write32(Adapter, REG_RCR, usb_read32(Adapter, 
REG_RCR)|RCR_CBSSID_BCN);
                }
                break;
        case HW_VAR_MLME_JOIN:
@@ -1449,13 +1440,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 
variable, u8 *val)
                                /* enable to rx data frame.Accept all data 
frame */
                                usb_write16(Adapter, REG_RXFLTMAP2, 0xFFFF);
 
-                               if (Adapter->in_cta_test) {
-                                       u32 v = usb_read32(Adapter, REG_RCR);
-                                       v &= ~(RCR_CBSSID_DATA | 
RCR_CBSSID_BCN);/*  RCR_ADF */
-                                       usb_write32(Adapter, REG_RCR, v);
-                               } else {
-                                       usb_write32(Adapter, REG_RCR, 
usb_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN);
-                               }
+                               usb_write32(Adapter, REG_RCR, 
usb_read32(Adapter, REG_RCR)|RCR_CBSSID_DATA|RCR_CBSSID_BCN);
 
                                if (check_fwstate(pmlmepriv, 
WIFI_STATION_STATE))
                                        RetryLimit = (haldata->CustomerID == 
RT_CID_CCX) ? 7 : 48;
diff --git a/drivers/staging/rtl8188eu/include/drv_types.h 
b/drivers/staging/rtl8188eu/include/drv_types.h
index 384a09b..e5def33 100644
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -229,8 +229,6 @@ struct adapter {
        spinlock_t br_ext_lock;
 
        u8      fix_rate;
-
-       unsigned char     in_cta_test;
 };
 
 #define adapter_to_dvobj(adapter) (adapter->dvobj)
-- 
2.7.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel