staging: rtl8723bs: rename enum items related to channel bonding

since rtl8723bs card allows only 20Mhz and 40Mhz channels,
rename enum items related to channel bonding accordingly to
the only composite channel bandwidth allowed in 2.4Ghz
(i.e. 40Mhz) in a HT context (since VHT isn't supported)

Example:

VHT_DATA_SC_20_LOWER_OF_80MHZ ->
	HT_DATA_SC_LOWER_OF_40MHZ

Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/a4172419996bdcaf96f0d9b5438b3b2372ff69b7.1624367071.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 3ecd034..059d305 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2530,18 +2530,18 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)
 
        if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
                if (pattrib->bwmode == CHANNEL_WIDTH_40) {
-                       SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
+                       SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
                } else if (pattrib->bwmode == CHANNEL_WIDTH_20) {
                        if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) {
-                               SCSettingOfDesc = VHT_DATA_SC_20_UPPER_OF_80MHZ;
+                               SCSettingOfDesc = HT_DATA_SC_20_UPPER_OF_40MHZ;
                        } else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) {
-                               SCSettingOfDesc = VHT_DATA_SC_20_LOWER_OF_80MHZ;
+                               SCSettingOfDesc = HT_DATA_SC_20_LOWER_OF_40MHZ;
                        } else {
-                               SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
+                               SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
                        }
                }
        } else {
-               SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
+               SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
        }
 
        return SCSettingOfDesc;

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 2754608..23435dc 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -621,9 +621,9 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter)
 
        if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
                if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
-                       SCSettingOf20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;
+                       SCSettingOf20 = HT_DATA_SC_20_UPPER_OF_40MHZ;
                else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
-                       SCSettingOf20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;
+                       SCSettingOf20 = HT_DATA_SC_20_LOWER_OF_40MHZ;
        }
 
        return  (SCSettingOf40 << 4) | SCSettingOf20;

diff --git a/drivers/staging/rtl8723bs/include/rtw_rf.h b/drivers/staging/rtl8723bs/include/rtw_rf.h
index 5504716..48ff15a 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_rf.h
+++ b/drivers/staging/rtl8723bs/include/rtw_rf.h
@@ -95,9 +95,9 @@ enum extchnl_offset {
 };
 
 enum {
-       VHT_DATA_SC_DONOT_CARE = 0,
-       VHT_DATA_SC_20_UPPER_OF_80MHZ = 1,
-       VHT_DATA_SC_20_LOWER_OF_80MHZ = 2,
+       HT_DATA_SC_DONOT_CARE = 0,
+       HT_DATA_SC_20_UPPER_OF_40MHZ = 1,
+       HT_DATA_SC_20_LOWER_OF_40MHZ = 2,
 };
 
 /* 2007/11/15 MH Define different RF type. */