staging: r8188eu: pSecurity is set but never used

pSecurity in odm_dm_struct is set but never used. Remove it.

Acked-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211202192309.9362-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index aa52495..f349845 100644 (file)
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -237,9 +237,6 @@ void ODM_CmnInfoHook(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn
        case    ODM_CMNINFO_SEC_CHNL_OFFSET:
                pDM_Odm->pSecChOffset = (u8 *)pValue;
                break;
-       case    ODM_CMNINFO_SEC_MODE:
-               pDM_Odm->pSecurity = (u8 *)pValue;
-               break;
        case    ODM_CMNINFO_BW:
                pDM_Odm->pBandWidth = (u8 *)pValue;
                break;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_dm.c b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
index 5725774..389a0c6 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_dm.c
@@ -72,7 +72,6 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
        ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_RX_UNI, &Adapter->recvpriv.rx_bytes);
        ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_WM_MODE, &pmlmeext->cur_wireless_mode);
        ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_SEC_CHNL_OFFSET, &hal_data->nCur40MhzPrimeSC);
-       ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_SEC_MODE, &Adapter->securitypriv.dot11PrivacyAlgrthm);
        ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_BW, &hal_data->CurrentChannelBW);
        ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_CHNL, &hal_data->CurrentChannel);
        ODM_CmnInfoHook(dm_odm, ODM_CMNINFO_SCAN, &pmlmepriv->bScanInProcess);

diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index f3f17ad..bb1df9d 100644 (file)
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -228,7 +228,6 @@ enum odm_common_info_def {
        ODM_CMNINFO_RX_UNI,
        ODM_CMNINFO_WM_MODE,            /*  ODM_WIRELESS_MODE_E */
        ODM_CMNINFO_SEC_CHNL_OFFSET,    /*  ODM_SEC_CHNL_OFFSET_E */
-       ODM_CMNINFO_SEC_MODE,           /*  ODM_SECURITY_E */
        ODM_CMNINFO_BW,                 /*  ODM_BW_E */
        ODM_CMNINFO_CHNL,
 
@@ -480,8 +479,6 @@ struct odm_dm_struct {
        u8      *pWirelessMode; /* ODM_WIRELESS_MODE_E */
        /*  Secondary channel offset don't_care/below/above = 0/1/2 */
        u8      *pSecChOffset;
-       /*  Security mode Open/WEP/AES/TKIP = 0/1/2/3 */
-       u8      *pSecurity;
        /*  BW info 20M/40M/80M = 0/1/2 */
        u8      *pBandWidth;
        /*  Central channel location Ch1/Ch2/.... */