staging: rtl8723au: Remove write-only variable ControlChannel

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 11c9a36900e3e8b47a65539fea0004a4512821ac..cb2b7b6d7e4527e22cfa4d57b8f17e8e4ebcc92c 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -416,15 +416,6 @@ static void odm_CommonInfoSelfUpdate(struct hal_data_8723a *pHalData)
        u8 EntryCnt = 0;
        u8 i;
 
-       if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_40) {
-               if (pHalData->nCur40MhzPrimeSC == 1)
-                       pDM_Odm->ControlChannel = pHalData->CurrentChannel - 2;
-               else if (pHalData->nCur40MhzPrimeSC == 2)
-                       pDM_Odm->ControlChannel = pHalData->CurrentChannel + 2;
-       } else {
-               pDM_Odm->ControlChannel = pHalData->CurrentChannel;
-       }
-
        for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {
                pEntry = pDM_Odm->pODM_StaInfo[i];
                if (pEntry)

diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h
index fce9358d090e82307db64f4fecbdad6516ba8742..586ef005bb88ef1d5e2ed86df6af8cba3c0e32f2 100644 (file)
--- a/drivers/staging/rtl8723au/include/odm.h
+++ b/drivers/staging/rtl8723au/include/odm.h
@@ -598,7 +598,6 @@ struct dm_odm_t {
 /*  ODM HANDLE, DRIVER NEEDS NOT TO HOOK------ */
        bool                    bCckHighPower;
        u8                      RFPathRxEnable;         /*  ODM_CMNINFO_RFPATH_ENABLE */
-       u8                      ControlChannel;
 /*  ODM HANDLE, DRIVER NEEDS NOT TO HOOK------ */
 
 /* 1  COMMON INFORMATION */