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

Commit 82407f38 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: remove software_encrypt member of registry_priv struct 



Value of this variable does not changed after initialization.
Replace software_encrypt with its default value.

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

drivers/staging/rtl8188eu/include/drv_types.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ struct registry_priv { 
	u8	ips_mode;

	u8	ips_mode;

	u8	smart_ps;

	u8	smart_ps;

	u8	mp_mode;

	u8	mp_mode;

	u8	software_encrypt;

	u8	acm_method;

	u8	acm_method;

	  /* UAPSD */

	  /* UAPSD */

	u8	wmm_enable;

	u8	wmm_enable;

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -163,7 +163,6 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev) 
	registry_par->power_mgnt = (u8)rtw_power_mgnt;

	registry_par->power_mgnt = (u8)rtw_power_mgnt;

	registry_par->ips_mode = (u8)rtw_ips_mode;

	registry_par->ips_mode = (u8)rtw_ips_mode;

	registry_par->mp_mode = 0;

	registry_par->mp_mode = 0;

	registry_par->software_encrypt = 0;

	registry_par->acm_method = (u8)rtw_acm_method;

	registry_par->acm_method = (u8)rtw_acm_method;





	 /* UAPSD */

	 /* UAPSD */
@@ -389,7 +388,7 @@ static u8 rtw_init_default_value(struct adapter *padapter) 




	/* security_priv */

	/* security_priv */

	psecuritypriv->binstallGrpkey = _FAIL;

	psecuritypriv->binstallGrpkey = _FAIL;

	psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;

	psecuritypriv->sw_encrypt = 0;

	psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;

	psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;

	psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;

	psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;

	psecuritypriv->dot11PrivacyKeyIndex = 0;

	psecuritypriv->dot11PrivacyKeyIndex = 0;