staging:r8188eu: remove sw_encrypt member of security_priv struct

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

sw_encrypt always is 0. Replace sw_encrypt with 0.

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

authored by

Ivan Safonov and committed by

Greg Kroah-Hartman 9 years ago 1375baa9 82407f38

+5 -10

4 changed files

expand all

drivers

staging

rtl8188eu

core

rtw_xmit.c

hal

rtl8188eu_xmit.c

include

rtw_security.h

os_dep

os_intfs.c

+4 -6

drivers/staging/rtl8188eu/core/rtw_xmit.c

··· 587 587 } 588 588 589 589 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, 590 - ("update_attrib: encrypt=%d securitypriv.sw_encrypt=%d\n", 591 - pattrib->encrypt, padapter->securitypriv.sw_encrypt)); 590 + ("update_attrib: encrypt=%d\n", pattrib->encrypt)); 592 591 593 - if (pattrib->encrypt && 594 - (padapter->securitypriv.sw_encrypt || !psecuritypriv->hw_decrypted)) { 592 + if (pattrib->encrypt && !psecuritypriv->hw_decrypted) { 595 593 pattrib->bswenc = true; 596 594 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, 597 - ("update_attrib: encrypt=%d securitypriv.hw_decrypted=%d bswenc = true\n", 598 - pattrib->encrypt, padapter->securitypriv.sw_encrypt)); 595 + ("update_attrib: encrypt=%d bswenc = true\n", 596 + pattrib->encrypt)); 599 597 } else { 600 598 pattrib->bswenc = false; 601 599 RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("update_attrib: bswenc = false\n"));

+1 -2

drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c

··· 346 346 struct xmit_buf *pxmitbuf = pxmitframe->pxmitbuf; 347 347 struct pkt_attrib *pattrib = &pxmitframe->attrib; 348 348 struct xmit_priv *pxmitpriv = &adapt->xmitpriv; 349 - struct security_priv *psecuritypriv = &adapt->securitypriv; 350 349 351 350 if ((pxmitframe->frame_tag == DATA_FRAMETAG) && 352 351 (pxmitframe->attrib.ether_type != 0x0806) && ··· 365 366 RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("pattrib->nr_frags=%d\n", pattrib->nr_frags)); 366 367 367 368 sz = pxmitpriv->frag_len; 368 - sz = sz - 4 - (psecuritypriv->sw_encrypt ? 0 : pattrib->icv_len); 369 + sz = sz - 4 - pattrib->icv_len; 369 370 } else { 370 371 /* no frag */ 371 372 sz = pattrib->last_txcmdsz;

-1

drivers/staging/rtl8188eu/include/rtw_security.h

··· 133 133 u8 busetkipkey; 134 134 u8 bcheck_grpkey; 135 135 u8 bgrpkey_handshake; 136 - s32 sw_encrypt;/* from registry_priv */ 137 136 s32 hw_decrypted;/* if the rx packets is hw_decrypted==false,i 138 137 * it means the hw has not been ready. */ 139 138

-1

drivers/staging/rtl8188eu/os_dep/os_intfs.c

··· 388 388 389 389 /* security_priv */ 390 390 psecuritypriv->binstallGrpkey = _FAIL; 391 - psecuritypriv->sw_encrypt = 0; 392 391 psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; 393 392 psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_; 394 393 psecuritypriv->dot11PrivacyKeyIndex = 0;