Commit 72d8054a authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

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: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220206161809.423031-12-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5b45a53

drivers/staging/r8188eu/hal/usb_halinit.c

+2 −14
Original line number Diff line number Diff line
@@ -1104,16 +1104,10 @@ 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);

			}

		}

		}

		break;

	case HW_VAR_MLME_JOIN:

		{
@@ -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);

				}



				if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))

					RetryLimit = 48;

drivers/staging/r8188eu/include/drv_types.h

+0 −2
Original line number Diff line number Diff line
@@ -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)