Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2104905a authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove in_cta_test member of struct adapter 



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

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cd3809e

drivers/staging/rtl8188eu/hal/usb_halinit.c

+3 −18
Original line number Diff line number Diff line
@@ -1426,18 +1426,9 @@ 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);

		}

			}

		}

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

				}



				if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))

					RetryLimit = (haldata->CustomerID == RT_CID_CCX) ? 7 : 48;

drivers/staging/rtl8188eu/include/drv_types.h

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