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>

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 96526fe6f6db8bbb964815a30baff2041b8063b4..c6c4404e717b9195019ef6dcaad850c5760052d4 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -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;
 
                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*/
                if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&
                    !IS_MCAST(prxattrib->ra) && prxattrib->encrypt > 0 &&
-                   (prxattrib->bdecrypted == 0 || psecuritypriv->sw_decrypt) &&
+                   prxattrib->bdecrypted == 0 &&
                    !is_wep_enc(psecuritypriv->dot11PrivacyAlgrthm) &&
                    !psecuritypriv->busetkipkey) {
                        rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);

diff --git a/drivers/staging/rtl8188eu/include/rtw_security.h b/drivers/staging/rtl8188eu/include/rtw_security.h
index 7100d6b01b3214bd9d7929c645e37b59b08ec032..2eda6778b4094ab53e27910ded34fd7de1f8952e 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_security.h
+++ b/drivers/staging/rtl8188eu/include/rtw_security.h
@@ -134,7 +134,6 @@ struct security_priv {
        u8      bcheck_grpkey;
        u8      bgrpkey_handshake;
        s32     sw_encrypt;/* from registry_priv */
-       s32     sw_decrypt;/* from registry_priv */
        s32     hw_decrypted;/* if the rx packets is hw_decrypted==false,i
                              * it means the hw has not been ready. */
 

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index 451deb0938abd31aa3b7e7be7ffe0aded84ec5c9..8fee58fec8fd7f0998be5fe08611554913dbf97e 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -392,7 +392,6 @@ static u8 rtw_init_default_value(struct adapter *padapter)
        /* security_priv */
        psecuritypriv->binstallGrpkey = _FAIL;
        psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
-       psecuritypriv->sw_decrypt = 0;
        psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
        psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
        psecuritypriv->dot11PrivacyKeyIndex = 0;