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

Commit 22883879 authored Apr 02, 2017 by Ivan Safonov Committed by Greg Kroah-Hartman Apr 08, 2017

staging:r8188eu: remove sw_decrypt member of security_priv struct



sw_decrypt always is 0, so replace it with 0.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8c986111

drivers/staging/rtl8188eu/core/rtw_recv.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -392,7 +392,7 @@ static struct recv_frame decryptor(struct adapter padapter,
	}		}
	}		}

	if ((prxattrib->encrypt > 0) && ((prxattrib->bdecrypted == 0) \|\| (psecuritypriv->sw_decrypt))) {		if ((prxattrib->encrypt > 0) && (prxattrib->bdecrypted == 0)) {
	psecuritypriv->hw_decrypted = false;		psecuritypriv->hw_decrypted = false;

	switch (prxattrib->encrypt) {		switch (prxattrib->encrypt) {
	@@ -1979,7 +1979,7 @@ static int recv_func(struct adapter padapter, struct recv_frame rframe)
	/* check if need to enqueue into uc_swdec_pending_queue*/		/* check if need to enqueue into uc_swdec_pending_queue*/
	if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&		if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&
	!IS_MCAST(prxattrib->ra) && prxattrib->encrypt > 0 &&		!IS_MCAST(prxattrib->ra) && prxattrib->encrypt > 0 &&
	(prxattrib->bdecrypted == 0 \|\| psecuritypriv->sw_decrypt) &&		prxattrib->bdecrypted == 0 &&
	!is_wep_enc(psecuritypriv->dot11PrivacyAlgrthm) &&		!is_wep_enc(psecuritypriv->dot11PrivacyAlgrthm) &&
	!psecuritypriv->busetkipkey) {		!psecuritypriv->busetkipkey) {
	rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);		rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);

drivers/staging/rtl8188eu/include/rtw_security.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,6 @@ struct security_priv {
	u8 bcheck_grpkey;		u8 bcheck_grpkey;
	u8 bgrpkey_handshake;		u8 bgrpkey_handshake;
	s32 sw_encrypt;/* from registry_priv */		s32 sw_encrypt;/* from registry_priv */
	s32 sw_decrypt;/* from registry_priv */
	s32 hw_decrypted;/* if the rx packets is hw_decrypted==false,i		s32 hw_decrypted;/* if the rx packets is hw_decrypted==false,i
	* it means the hw has not been ready. */		* it means the hw has not been ready. */

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -392,7 +392,6 @@ 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 = pregistrypriv->software_encrypt;
	psecuritypriv->sw_decrypt = 0;
	psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;		psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
	psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;		psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
	psecuritypriv->dot11PrivacyKeyIndex = 0;		psecuritypriv->dot11PrivacyKeyIndex = 0;