staging: r8188eu: in_cta_test is always 0

in_cta_test in struct adapter is never set, so it's always 0.

Remove in_cta_test and related dead code.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220206161809.423031-12-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 3b3cb03d398906ecc7a85f79c1bfe285560b9465..659e0f26db29da2efcb5cab9145db1b10d62bd95 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1105,13 +1105,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                        if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
                                rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSID_BCN);
                        } else {
-                               if (Adapter->in_cta_test) {
-                                       u32 v = rtw_read32(Adapter, REG_RCR);
-                                       v &= ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN);/*  RCR_ADF */
-                                       rtw_write32(Adapter, REG_RCR, v);
-                               } else {
-                                       rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSID_BCN);
-                               }
+                               rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSID_BCN);
                        }
                }
                break;
@@ -1125,13 +1119,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                                /* enable to rx data frame.Accept all data frame */
                                rtw_write16(Adapter, REG_RXFLTMAP2, 0xFFFF);
 
-                               if (Adapter->in_cta_test) {
-                                       u32 v = rtw_read32(Adapter, REG_RCR);
-                                       v &= ~(RCR_CBSSID_DATA | RCR_CBSSID_BCN);/*  RCR_ADF */
-                                       rtw_write32(Adapter, REG_RCR, v);
-                               } else {
-                                       rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSID_DATA | RCR_CBSSID_BCN);
-                               }
+                               rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR) | RCR_CBSSID_DATA | RCR_CBSSID_BCN);
 
                                if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
                                        RetryLimit = 48;

diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 4553cfda0aa44647b6da873353976ab3160aedf0..3d5eb37a4c51ac5e659a276a9d55825bd4ca48ec 100644 (file)
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -232,8 +232,6 @@ struct adapter {
        unsigned char                   br_mac[ETH_ALEN];
        unsigned char                   br_ip[4];
        struct br_ext_info              ethBrExtInfo;
-
-       unsigned char     in_cta_test;
 };
 
 #define adapter_to_dvobj(adapter) (adapter->dvobj)