This patch series removes all occurences of 5Ghz code over the
driver as required from driver's TODO list:
- find and remove remaining code valid only for 5 GHz.
most of the obvious one have been removed, but things
like channel > 14 still exist.
rtl8723bs work on 2.4Ghz band and supports 802.11bgn standards.
So all code related to 802.11a/ac standard is removed, as well
as code related to channel numbers above 14.
VHT code is deleted as well, for it's related to 802.11ac.
Comments are fixed accordingly and many unused variables are
deleted.
Every single patch of this series has been tested on a
Lenovo Ideapad MIIX 300-10IBY except for the last one,
for obvious reason (it deletes just the TODO item).
So:
Tested-by: Fabio Auto <[email protected]>
Fabio Aiuto (18):
staging: rtl8723bs: remove all 5Ghz network types
staging: rtl8723bs: remove code related to unsupported channel
bandwidth
staging: rtl8723bs: remove unused enum items related to channel
bonding
staging: rtl8723bs: rename enum items related to channel bonding
staging: rtl8723bs: remove 5Ghz field in struct registry_priv
staging: rtl8723bs: remove struct rt_channel_plan_5g
staging: rtl8723bs: remove all branchings between 2.4Ghz and 5Ghz band
types
staging: rtl8723bs: beautify prototypes in include/hal_com_phycfg.h
staging: rtl8723bs: remove 5Ghz code related to channel plan
definition
staging: rtl8723bs: remove some unused 5Ghz macro definitions
staging: rtl8723bs: remove 5Ghz code related to RF power calibration
staging: rtl8723bs: remove VHT dead code
staging: rtl8723bs: remove unused ODM_CMNINFO_BOARD_TYPE enum item
staging: rtl8723bs: fix macro value for 2.4Ghz only device
staging: rtl8723bs: remove register initializations tied to 802.11ac
standard
staging: rtl8723bs: remove obsolete 5Ghz comments
staging: rtl8723bs: fix check allowing 5Ghz settings
staging: rtl8723bs: remove item from TODO list
drivers/staging/rtl8723bs/TODO | 2 -
drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +-
.../staging/rtl8723bs/core/rtw_ieee80211.c | 22 +-
drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 -
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 328 ++---
.../staging/rtl8723bs/core/rtw_wlan_util.c | 29 +-
drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 +-
.../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 4 +-
.../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 5 +-
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 -
.../staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 17 +-
.../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 595 ++++-----
.../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 19 +-
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 4 -
drivers/staging/rtl8723bs/hal/hal_com.c | 241 ----
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 1059 +++--------------
drivers/staging/rtl8723bs/hal/odm.c | 50 -
drivers/staging/rtl8723bs/hal/odm.h | 42 +-
drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 -
.../rtl8723bs/hal/odm_EdcaTurboCheck.c | 4 +-
.../rtl8723bs/hal/odm_RegConfig8723B.c | 5 +-
.../rtl8723bs/hal/odm_RegConfig8723B.h | 2 -
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 1 -
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 53 +-
.../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 43 +-
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 -
.../rtl8723bs/include/Hal8192CPhyReg.h | 2 -
drivers/staging/rtl8723bs/include/drv_types.h | 10 +-
drivers/staging/rtl8723bs/include/hal_com.h | 62 +-
.../rtl8723bs/include/hal_com_phycfg.h | 198 +--
.../staging/rtl8723bs/include/hal_com_reg.h | 1 -
drivers/staging/rtl8723bs/include/hal_data.h | 40 +-
drivers/staging/rtl8723bs/include/hal_pg.h | 2 -
drivers/staging/rtl8723bs/include/hal_phy.h | 10 -
drivers/staging/rtl8723bs/include/ieee80211.h | 67 +-
.../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
.../staging/rtl8723bs/include/rtw_mlme_ext.h | 52 +-
drivers/staging/rtl8723bs/include/rtw_rf.h | 33 +-
drivers/staging/rtl8723bs/include/wifi.h | 1 -
.../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 -
.../staging/rtl8723bs/os_dep/ioctl_linux.c | 8 +-
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 13 +-
drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 -
44 files changed, 640 insertions(+), 2450 deletions(-)
--
2.20.1
remove all code related to unsupported channel
bandwidth (i.e. 80, 80+80, 160 Mhz). rtl8723bs NIC
works only on 20 and 40 Mhz channels.
Module parameter rtw_bw_mode can only have two
values: 0 and 1 (20 Mhz and 40Mhz). So modify
the default value setting to zero the 5Ghz nibble.
Comments modified accordingly.
Signed-off-by: Fabio Aiuto <[email protected]>
---
.../staging/rtl8723bs/core/rtw_wlan_util.c | 15 +-------
drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 +--
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 34 -------------------
drivers/staging/rtl8723bs/hal/odm.h | 3 --
drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 --
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 31 ++---------------
.../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 33 +-----------------
drivers/staging/rtl8723bs/include/drv_types.h | 8 +++--
drivers/staging/rtl8723bs/include/rtw_rf.h | 4 ---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 10 +++---
10 files changed, 17 insertions(+), 128 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 2a47d678de01..c06b74f6569a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -336,9 +336,7 @@ u8 rtw_get_center_ch(u8 channel, u8 chnl_bw, u8 chnl_offset)
{
u8 center_ch = channel;
- if (chnl_bw == CHANNEL_WIDTH_80) {
- center_ch = 7;
- } else if (chnl_bw == CHANNEL_WIDTH_40) {
+ if (chnl_bw == CHANNEL_WIDTH_40) {
if (chnl_offset == HAL_PRIME_CHNL_OFFSET_LOWER)
center_ch = channel + 2;
else
@@ -375,14 +373,6 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne
center_ch = rtw_get_center_ch(channel, bwmode, channel_offset);
- if (bwmode == CHANNEL_WIDTH_80) {
- if (center_ch > channel)
- chnl_offset80 = HAL_PRIME_CHNL_OFFSET_LOWER;
- else if (center_ch < channel)
- chnl_offset80 = HAL_PRIME_CHNL_OFFSET_UPPER;
- else
- chnl_offset80 = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
- }
/* set Channel */
if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->setch_mutex)))
@@ -919,9 +909,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_
if (phtpriv->ht_option == false)
return;
- if (pmlmeext->cur_bwmode >= CHANNEL_WIDTH_80)
- return;
-
if (pIE->Length > sizeof(struct HT_info_element))
return;
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 0562fa6c1255..79e4d7df1ef5 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -321,15 +321,12 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
u8 query_ra_short_GI(struct sta_info *psta)
{
- u8 sgi = false, sgi_20m = false, sgi_40m = false, sgi_80m = false;
+ u8 sgi = false, sgi_20m = false, sgi_40m = false;
sgi_20m = psta->htpriv.sgi_20m;
sgi_40m = psta->htpriv.sgi_40m;
switch (psta->bw_mode) {
- case CHANNEL_WIDTH_80:
- sgi = sgi_80m;
- break;
case CHANNEL_WIDTH_40:
sgi = sgi_40m;
break;
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 94d11689b4ac..56e657d2aaac 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -995,7 +995,6 @@ u8 PHY_GetTxPowerIndexBase(
)
{
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
- u8 i = 0; /* default set to 1S */
u8 txPower = 0;
u8 chnlIdx = (Channel-1);
@@ -1035,18 +1034,6 @@ u8 PHY_GetTxPowerIndexBase(
txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
}
- /* Willis suggest adopt BW 40M power index while in BW 80 mode */
- else if (BandWidth == CHANNEL_WIDTH_80) {
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S];
- if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
-
- }
} else {/* 3 ============================== 5 G ============================== */
if (MGN_6M <= Rate)
txPower = pHalData->Index5G_BW40_Base[RFPath][chnlIdx];
@@ -1076,23 +1063,6 @@ u8 PHY_GetTxPowerIndexBase(
if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
txPower += pHalData->BW40_5G_Diff[RFPath][TX_4S];
- } else if (BandWidth == CHANNEL_WIDTH_80) { /* BW80-1S, BW80-2S */
- /* <20121220, Kordan> Get the index of array "Index5G_BW80_Base". */
- u8 channel5G_80M[CHANNEL_MAX_NUMBER_5G_80M] = {42, 58, 106, 122, 138, 155, 171};
- for (i = 0; i < ARRAY_SIZE(channel5G_80M); ++i)
- if (channel5G_80M[i] == Channel)
- chnlIdx = i;
-
- txPower = pHalData->Index5G_BW80_Base[RFPath][chnlIdx];
-
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += + pHalData->BW80_5G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW80_5G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW80_5G_Diff[RFPath][TX_3S];
- if ((MGN_MCS23 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW80_5G_Diff[RFPath][TX_4S];
}
}
@@ -1512,10 +1482,6 @@ static s16 get_bandwidth_idx(const enum channel_width bandwidth)
return 0;
case CHANNEL_WIDTH_40:
return 1;
- case CHANNEL_WIDTH_80:
- return 2;
- case CHANNEL_WIDTH_160:
- return 3;
default:
return -1;
}
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index 7e2d3679c7d0..a7a77fbb8390 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -471,9 +471,6 @@ enum { /* tag_Band_Type_Definition */
enum { /* tag_Bandwidth_Definition */
ODM_BW20M = 0,
ODM_BW40M = 1,
- ODM_BW80M = 2,
- ODM_BW160M = 3,
- ODM_BW10M = 4,
};
/* ODM_CMNINFO_BOARD_TYPE */
diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index 702bb065636a..ef5b48bb01b2 100644
--- a/drivers/staging/rtl8723bs/hal/odm_DIG.c
+++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c
@@ -230,8 +230,6 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI)
IGI_target = pDM_Odm->IGI_Base;
else if (*pDM_Odm->pBandWidth == ODM_BW40M)
IGI_target = pDM_Odm->IGI_Base + 2;
- else if (*pDM_Odm->pBandWidth == ODM_BW80M)
- IGI_target = pDM_Odm->IGI_Base + 2;
else
IGI_target = pDM_Odm->IGI_Base;
pDM_Odm->IGI_target = (u8) IGI_target;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 6359cd661374..3ecd034342ec 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2509,15 +2509,8 @@ u8 BWMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)
u8 BWSettingOfDesc = 0;
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
- if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) {
- if (pattrib->bwmode == CHANNEL_WIDTH_80)
- BWSettingOfDesc = 2;
- else if (pattrib->bwmode == CHANNEL_WIDTH_40)
- BWSettingOfDesc = 1;
- else
- BWSettingOfDesc = 0;
- } else if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
- if ((pattrib->bwmode == CHANNEL_WIDTH_40) || (pattrib->bwmode == CHANNEL_WIDTH_80))
+ if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
+ if (pattrib->bwmode == CHANNEL_WIDTH_40)
BWSettingOfDesc = 1;
else
BWSettingOfDesc = 0;
@@ -2535,25 +2528,7 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)
u8 SCSettingOfDesc = 0;
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
- if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) {
- if (pattrib->bwmode == CHANNEL_WIDTH_80) {
- SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
- } else if (pattrib->bwmode == CHANNEL_WIDTH_40) {
- if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
- SCSettingOfDesc = VHT_DATA_SC_40_LOWER_OF_80MHZ;
- else if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
- SCSettingOfDesc = VHT_DATA_SC_40_UPPER_OF_80MHZ;
- } else {
- if ((pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) && (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER))
- SCSettingOfDesc = VHT_DATA_SC_20_LOWEST_OF_80MHZ;
- else if ((pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) && (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER))
- SCSettingOfDesc = VHT_DATA_SC_20_LOWER_OF_80MHZ;
- else if ((pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) && (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER))
- SCSettingOfDesc = VHT_DATA_SC_20_UPPER_OF_80MHZ;
- else if ((pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) && (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER))
- SCSettingOfDesc = VHT_DATA_SC_20_UPPERST_OF_80MHZ;
- }
- } else if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
+ if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
if (pattrib->bwmode == CHANNEL_WIDTH_40) {
SCSettingOfDesc = VHT_DATA_SC_DONOT_CARE;
} else if (pattrib->bwmode == CHANNEL_WIDTH_20) {
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 3a2e3d0e88e8..275460865719 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -609,11 +609,6 @@ static void phy_SetRegBW_8723B(
rtw_write16(Adapter, REG_TRXPTCL_CTL_8723B, (u2tmp & 0xFEFF)); /* BIT 7 = 1, BIT 8 = 0 */
break;
- case CHANNEL_WIDTH_80:
- u2tmp = RegRfMod_BW | BIT8;
- rtw_write16(Adapter, REG_TRXPTCL_CTL_8723B, (u2tmp & 0xFF7F)); /* BIT 7 = 0, BIT 8 = 1 */
- break;
-
default:
break;
}
@@ -624,33 +619,7 @@ static u8 phy_GetSecondaryChnl_8723B(struct adapter *Adapter)
u8 SCSettingOf40 = 0, SCSettingOf20 = 0;
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
- if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_80) {
- if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
- SCSettingOf40 = VHT_DATA_SC_40_LOWER_OF_80MHZ;
- else if (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
- SCSettingOf40 = VHT_DATA_SC_40_UPPER_OF_80MHZ;
-
- if (
- (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) &&
- (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
- )
- SCSettingOf20 = VHT_DATA_SC_20_LOWEST_OF_80MHZ;
- else if (
- (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) &&
- (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
- )
- SCSettingOf20 = VHT_DATA_SC_20_LOWER_OF_80MHZ;
- else if (
- (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) &&
- (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
- )
- SCSettingOf20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;
- else if (
- (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) &&
- (pHalData->nCur80MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
- )
- SCSettingOf20 = VHT_DATA_SC_20_UPPERST_OF_80MHZ;
- } else if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
+ if (pHalData->CurrentChannelBW == CHANNEL_WIDTH_40) {
if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
SCSettingOf20 = VHT_DATA_SC_20_UPPER_OF_80MHZ;
else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index cc0dac355589..02df5bd8f575 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -108,9 +108,11 @@ struct registry_priv {
struct wlan_bssid_ex dev_network;
u8 ht_enable;
- /* 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160MHz */
- /* 2.4G use bit 0 ~ 3, 5G use bit 4 ~ 7 */
- /* 0x21 means enable 2.4G 40MHz & 5G 80MHz */
+ /*
+ * 0: 20 MHz, 1: 40 MHz
+ * 2.4G use bit 0 ~ 3
+ * 0x01 means enable 2.4G 40MHz
+ */
u8 bw_mode;
u8 ampdu_enable;/* for tx */
u8 rx_stbc;
diff --git a/drivers/staging/rtl8723bs/include/rtw_rf.h b/drivers/staging/rtl8723bs/include/rtw_rf.h
index cb6beccd3d23..98bc274e5e81 100644
--- a/drivers/staging/rtl8723bs/include/rtw_rf.h
+++ b/drivers/staging/rtl8723bs/include/rtw_rf.h
@@ -83,10 +83,6 @@ enum {
enum channel_width {
CHANNEL_WIDTH_20 = 0,
CHANNEL_WIDTH_40 = 1,
- CHANNEL_WIDTH_80 = 2,
- CHANNEL_WIDTH_160 = 3,
- CHANNEL_WIDTH_80_80 = 4,
- CHANNEL_WIDTH_MAX = 5,
};
/* Represent Extension Channel Offset in HT Capabilities */
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 4e7c115c8bc1..a06c8b1beb01 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -65,10 +65,12 @@ static int rtw_uapsd_acvi_en;
static int rtw_uapsd_acvo_en;
int rtw_ht_enable = 1;
-/* 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160MHz, 4: 80+80MHz */
-/* 2.4G use bit 0 ~ 3, 5G use bit 4 ~ 7 */
-/* 0x21 means enable 2.4G 40MHz & 5G 80MHz */
-static int rtw_bw_mode = 0x21;
+/*
+ * 0: 20 MHz, 1: 40 MHz
+ * 2.4G use bit 0 ~ 3
+ * 0x01 means enable 2.4G 40MHz
+ */
+static int rtw_bw_mode = 0x01;
static int rtw_ampdu_enable = 1;/* for enable tx_ampdu ,0: disable, 0x1:enable (but wifi_spec should be 0), 0x2: force enable (don't care wifi_spec) */
static int rtw_rx_stbc = 1;/* 0: disable, 1:enable 2.4g */
static int rtw_ampdu_amsdu;/* 0: disabled, 1:enabled, 2:auto . There is an IOT issu with DLINK DIR-629 when the flag turn on */
--
2.20.1
remove unused enum items related to channel bonding.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/include/rtw_rf.h | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/include/rtw_rf.h b/drivers/staging/rtl8723bs/include/rtw_rf.h
index 98bc274e5e81..550471637315 100644
--- a/drivers/staging/rtl8723bs/include/rtw_rf.h
+++ b/drivers/staging/rtl8723bs/include/rtw_rf.h
@@ -98,14 +98,6 @@ enum {
VHT_DATA_SC_DONOT_CARE = 0,
VHT_DATA_SC_20_UPPER_OF_80MHZ = 1,
VHT_DATA_SC_20_LOWER_OF_80MHZ = 2,
- VHT_DATA_SC_20_UPPERST_OF_80MHZ = 3,
- VHT_DATA_SC_20_LOWEST_OF_80MHZ = 4,
- VHT_DATA_SC_20_RECV1 = 5,
- VHT_DATA_SC_20_RECV2 = 6,
- VHT_DATA_SC_20_RECV3 = 7,
- VHT_DATA_SC_20_RECV4 = 8,
- VHT_DATA_SC_40_UPPER_OF_80MHZ = 9,
- VHT_DATA_SC_40_LOWER_OF_80MHZ = 10,
};
/* 2007/11/15 MH Define different RF type. */
--
2.20.1
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
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 10 +++++-----
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 ++--
drivers/staging/rtl8723bs/include/rtw_rf.h | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 3ecd034342ec..059d3050acc6 100644
--- 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 275460865719..23435dcc5537 100644
--- 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 550471637315..48ff15a38bb0 100644
--- 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. */
--
2.20.1
beautify function prototypes in incldue/hal_com_phycfg.h
in order to ease grep searches.
Signed-off-by: Fabio Aiuto <[email protected]>
---
.../rtl8723bs/include/hal_com_phycfg.h | 188 +++++-------------
1 file changed, 48 insertions(+), 140 deletions(-)
diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
index a30e1e09826d..3d95ab1986b1 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
@@ -70,147 +70,55 @@ struct bb_register_def {
};
-u8
-PHY_GetTxPowerByRateBase(
-struct adapter *Adapter,
-u8 RfPath,
-u8 TxNum,
-enum rate_section RateSection
- );
-
-u8
-PHY_GetRateSectionIndexOfTxPowerByRate(
-struct adapter *padapter,
-u32 RegAddr,
-u32 BitMask
- );
-
-void
-PHY_GetRateValuesOfTxPowerByRate(
-struct adapter *padapter,
-u32 RegAddr,
-u32 BitMask,
-u32 Value,
-u8 *RateIndex,
-s8 *PwrByRateVal,
-u8 *RateNum
- );
-
-u8
-PHY_GetRateIndexOfTxPowerByRate(
-u8 Rate
- );
-
-void
-PHY_SetTxPowerIndexByRateSection(
-struct adapter *padapter,
-u8 RFPath,
-u8 Channel,
-u8 RateSection
- );
-
-s8
-PHY_GetTxPowerByRate(
-struct adapter *padapter,
-u8 RFPath,
-u8 TxNum,
-u8 RateIndex
- );
-
-void
-PHY_SetTxPowerByRate(
-struct adapter *padapter,
-u8 RFPath,
-u8 TxNum,
-u8 Rate,
-s8 Value
- );
-
-void
-PHY_SetTxPowerLevelByPath(
-struct adapter *Adapter,
-u8 channel,
-u8 path
- );
-
-void
-PHY_SetTxPowerIndexByRateArray(
-struct adapter *padapter,
-u8 RFPath,
-enum channel_width BandWidth,
-u8 Channel,
-u8 *Rates,
-u8 RateArraySize
- );
-
-void
-PHY_InitTxPowerByRate(
-struct adapter *padapter
- );
-
-void
-PHY_StoreTxPowerByRate(
-struct adapter *padapter,
-u32 RfPath,
-u32 TxNum,
-u32 RegAddr,
-u32 BitMask,
-u32 Data
- );
-
-void
-PHY_TxPowerByRateConfiguration(
- struct adapter *padapter
- );
-
-u8
-PHY_GetTxPowerIndexBase(
-struct adapter *padapter,
-u8 RFPath,
-u8 Rate,
-enum channel_width BandWidth,
-u8 Channel
- );
+u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath, u8 TxNum,
+ enum rate_section RateSection);
+
+u8 PHY_GetRateSectionIndexOfTxPowerByRate(struct adapter *padapter, u32 RegAddr,
+ u32 BitMask);
+
+void PHY_GetRateValuesOfTxPowerByRate(struct adapter *padapter, u32 RegAddr,
+ u32 BitMask, u32 Value, u8 *RateIndex,
+ s8 *PwrByRateVal, u8 *RateNum);
+
+u8 PHY_GetRateIndexOfTxPowerByRate(u8 Rate);
+
+void PHY_SetTxPowerIndexByRateSection(struct adapter *padapter, u8 RFPath, u8 Channel,
+ u8 RateSection);
+
+s8 PHY_GetTxPowerByRate(struct adapter *padapter, u8 RFPath, u8 TxNum, u8 RateIndex);
+
+void PHY_SetTxPowerByRate(struct adapter *padapter, u8 RFPath, u8 TxNum, u8 Rate,
+ s8 Value);
+
+void PHY_SetTxPowerLevelByPath(struct adapter *Adapter, u8 channel, u8 path);
+
+void PHY_SetTxPowerIndexByRateArray(struct adapter *padapter, u8 RFPath,
+ enum channel_width BandWidth, u8 Channel,
+ u8 *Rates, u8 RateArraySize);
+
+void PHY_InitTxPowerByRate(struct adapter *padapter);
+
+void PHY_StoreTxPowerByRate(struct adapter *padapter, u32 RfPath, u32 TxNum,
+ u32 RegAddr, u32 BitMask, u32 Data);
+
+void PHY_TxPowerByRateConfiguration(struct adapter *padapter);
+
+u8 PHY_GetTxPowerIndexBase(struct adapter *padapter, u8 RFPath, u8 Rate,
+ enum channel_width BandWidth, u8 Channel);
s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 RegPwrTblSel,
- enum channel_width Bandwidth,
-u8 RfPath,
-u8 DataRate,
-u8 Channel
- );
-
-void
-PHY_SetTxPowerLimit(
-struct adapter *Adapter,
-u8 *Regulation,
-u8 *Bandwidth,
-u8 *RateSection,
-u8 *RfPath,
-u8 *Channel,
-u8 *PowerLimit
- );
-
-void
-PHY_ConvertTxPowerLimitToPowerIndex(
-struct adapter *Adapter
- );
-
-void
-PHY_InitTxPowerLimit(
-struct adapter *Adapter
- );
-
-s8
-PHY_GetTxPowerTrackingOffset(
- struct adapter *padapter,
- u8 Rate,
- u8 RFPath
- );
-
-void
-Hal_ChannelPlanToRegulation(
-struct adapter *Adapter,
-u16 ChannelPlan
- );
+ enum channel_width Bandwidth, u8 RfPath, u8 DataRate,
+ u8 Channel);
+
+void PHY_SetTxPowerLimit(struct adapter *Adapter, u8 *Regulation, u8 *Bandwidth,
+ u8 *RateSection, u8 *RfPath, u8 *Channel, u8 *PowerLimit);
+
+void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter);
+
+void PHY_InitTxPowerLimit(struct adapter *Adapter);
+
+s8 PHY_GetTxPowerTrackingOffset(struct adapter *padapter, u8 Rate, u8 RFPath);
+
+void Hal_ChannelPlanToRegulation(struct adapter *Adapter, u16 ChannelPlan);
#endif /* __HAL_COMMON_H__ */
--
2.20.1
remove unused 5Ghz field in struct registry_priv.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/include/drv_types.h | 2 --
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 -
2 files changed, 3 deletions(-)
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 02df5bd8f575..895c41526164 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -171,9 +171,7 @@ struct registry_priv {
u8 RegPowerBase;
u8 RegPwrTblSel;
s8 TxBBSwing_2G;
- s8 TxBBSwing_5G;
u8 AmplifierType_2G;
- u8 AmplifierType_5G;
u8 bEn_RFE;
u8 RFE_Type;
u8 check_fw_ps;
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index a06c8b1beb01..648456b992bb 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -289,7 +289,6 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
registry_par->RegPowerBase = 14;
registry_par->TxBBSwing_2G = 0xFF;
- registry_par->TxBBSwing_5G = 0xFF;
registry_par->bEn_RFE = 1;
registry_par->RFE_Type = 64;
--
2.20.1
remove all code branchings tied to dual band support. The device
works only on 2.4Ghz band so there's no need to check which
band we are on. Removed all code branches that would be valid
only for 5Ghz for it's dead code. Removed enums, table fields
indexing by band type, function arguments passing current
band type and all other thing related to telling us
which band we are on.
Signed-off-by: Fabio Aiuto <[email protected]>
---
.../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 4 +-
.../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 5 +-
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 -
.../staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 17 +-
.../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 518 +++++++------
.../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 2 +-
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 4 -
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 720 +++++-------------
drivers/staging/rtl8723bs/hal/odm.c | 8 -
drivers/staging/rtl8723bs/hal/odm.h | 11 -
.../rtl8723bs/hal/odm_RegConfig8723B.c | 5 +-
.../rtl8723bs/hal/odm_RegConfig8723B.h | 2 -
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 1 -
.../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 6 +-
.../rtl8723bs/include/hal_com_phycfg.h | 10 +-
drivers/staging/rtl8723bs/include/hal_data.h | 34 +-
drivers/staging/rtl8723bs/include/hal_phy.h | 7 -
17 files changed, 488 insertions(+), 867 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
index adfdc4f14b08..dc58bb87f1b0 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c
@@ -2222,7 +2222,6 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist)
bool bRoam = false;
bool bScan = false;
bool bLink = false;
- bool bWifiUnder5G = false;
bool bWifiUnderBMode = false;
bool bBtHsOn = false;
bool bWifiBusy = false;
@@ -2344,7 +2343,6 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist)
);
CL_PRINTF(cliBuf);
- pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_UNDER_5G, &bWifiUnder5G);
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_BW, &wifiBw);
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy);
pBtCoexist->fBtcGet(
@@ -2358,7 +2356,7 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist)
cliBuf,
BT_TMP_BUF_SIZE,
"\r\n %-35s = %s / %s/ %s/ AP =%d/ %s ", "Wifi status",
- (bWifiUnder5G ? "5G" : "2.4G"),
+ ("2.4G"),
((bWifiUnderBMode) ? "11b" : ((wifiBw == BTC_WIFI_BW_LEGACY) ? "11bg" : (((wifiBw == BTC_WIFI_BW_HT40) ? "HT40" : "HT20")))),
((!bWifiBusy) ? "idle" : ((wifiTrafficDir == BTC_WIFI_TRAFFIC_TX) ? "uplink" : "downlink")),
pCoexSta->nScanAPNum,
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
index 3829701f10f9..84241619fb3a 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
@@ -2431,7 +2431,7 @@ void EXhalbtc8723b2ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist)
u8 *cliBuf = pBtCoexist->cliBuf;
u8 u1Tmp[4], i, btInfoExt, psTdmaCase = 0;
u32 u4Tmp[4];
- bool bRoam = false, bScan = false, bLink = false, bWifiUnder5G = false;
+ bool bRoam = false, bScan = false, bLink = false;
bool bBtHsOn = false, bWifiBusy = false;
s32 wifiRssi = 0, btHsRssi = 0;
u32 wifiBw, wifiTrafficDir, faOfdm, faCck;
@@ -2522,7 +2522,6 @@ void EXhalbtc8723b2ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist)
);
CL_PRINTF(cliBuf);
- pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_UNDER_5G, &bWifiUnder5G);
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_BW, &wifiBw);
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy);
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, &wifiTrafficDir);
@@ -2530,7 +2529,7 @@ void EXhalbtc8723b2ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist)
cliBuf,
BT_TMP_BUF_SIZE,
"\r\n %-35s = %s / %s/ %s ", "Wifi status", \
- (bWifiUnder5G ? "5G" : "2.4G"),
+ ("2.4G"),
((BTC_WIFI_BW_LEGACY == wifiBw) ? "Legacy" : (((BTC_WIFI_BW_HT40 == wifiBw) ? "HT40" : "HT20"))),
((!bWifiBusy) ? "idle" : ((BTC_WIFI_TRAFFIC_TX == wifiTrafficDir) ? "uplink" : "downlink"))
);
diff --git a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h b/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
index db9d8a529877..deb57fa15eaf 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
+++ b/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
@@ -142,7 +142,6 @@ enum {
BTC_GET_BL_WIFI_LINK,
BTC_GET_BL_WIFI_ROAM,
BTC_GET_BL_WIFI_4_WAY_PROGRESS,
- BTC_GET_BL_WIFI_UNDER_5G,
BTC_GET_BL_WIFI_AP_MODE_ENABLE,
BTC_GET_BL_WIFI_ENABLE_ENCRYPTION,
BTC_GET_BL_WIFI_UNDER_B_MODE,
diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
index 77b9c672ff0e..3de8dcb5ed7c 100644
--- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
+++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c
@@ -543,12 +543,12 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct dm_odm_t *pDM_Odm)
******************************************************************************/
static u32 Array_MP_8723B_PHY_REG_PG[] = {
- 0, 0, 0, 0x00000e08, 0x0000ff00, 0x00003800,
- 0, 0, 0, 0x0000086c, 0xffffff00, 0x32343600,
- 0, 0, 0, 0x00000e00, 0xffffffff, 0x40424444,
- 0, 0, 0, 0x00000e04, 0xffffffff, 0x28323638,
- 0, 0, 0, 0x00000e10, 0xffffffff, 0x38404244,
- 0, 0, 0, 0x00000e14, 0xffffffff, 0x26303436
+ 0, 0, 0x00000e08, 0x0000ff00, 0x00003800,
+ 0, 0, 0x0000086c, 0xffffff00, 0x32343600,
+ 0, 0, 0x00000e00, 0xffffffff, 0x40424444,
+ 0, 0, 0x00000e04, 0xffffffff, 0x28323638,
+ 0, 0, 0x00000e10, 0xffffffff, 0x38404244,
+ 0, 0, 0x00000e14, 0xffffffff, 0x26303436
};
void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct dm_odm_t *pDM_Odm)
@@ -559,14 +559,13 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct dm_odm_t *pDM_Odm)
pDM_Odm->PhyRegPgVersion = 1;
pDM_Odm->PhyRegPgValueType = PHY_REG_PG_EXACT_VALUE;
- for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_PHY_REG_PG); i += 6) {
+ for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_PHY_REG_PG); i += 5) {
u32 v1 = Array[i];
u32 v2 = Array[i+1];
u32 v3 = Array[i+2];
u32 v4 = Array[i+3];
u32 v5 = Array[i+4];
- u32 v6 = Array[i+5];
- odm_ConfigBB_PHY_REG_PG_8723B(pDM_Odm, v1, v2, v3, v4, v5, v6);
+ odm_ConfigBB_PHY_REG_PG_8723B(pDM_Odm, v1, v2, v3, v4, v5);
}
}
diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
index e7a6566f2a24..f49032dc5bef 100644
--- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
+++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
@@ -445,258 +445,258 @@ void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct dm_odm_t *pDM_Odm)
******************************************************************************/
static u8 *Array_MP_8723B_TXPWR_LMT[] = {
- "FCC", "2.4G", "20M", "CCK", "1T", "01", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "01", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "01", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "02", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "02", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "02", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "03", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "03", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "03", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "04", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "04", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "04", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "05", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "05", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "05", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "06", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "06", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "06", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "07", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "07", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "07", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "08", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "08", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "08", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "09", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "09", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "09", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "10", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "10", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "10", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "11", "32",
- "ETSI", "2.4G", "20M", "CCK", "1T", "11", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "11", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "12", "63",
- "ETSI", "2.4G", "20M", "CCK", "1T", "12", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "12", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "13", "63",
- "ETSI", "2.4G", "20M", "CCK", "1T", "13", "32",
- "MKK", "2.4G", "20M", "CCK", "1T", "13", "32",
- "FCC", "2.4G", "20M", "CCK", "1T", "14", "63",
- "ETSI", "2.4G", "20M", "CCK", "1T", "14", "63",
- "MKK", "2.4G", "20M", "CCK", "1T", "14", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "01", "28",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "01", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "01", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "02", "28",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "02", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "02", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "03", "32",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "03", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "03", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "04", "32",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "04", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "04", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "05", "32",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "05", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "05", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "06", "32",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "06", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "06", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "07", "32",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "07", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "07", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "08", "32",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "08", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "08", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "09", "32",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "09", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "09", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "10", "28",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "10", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "10", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "11", "28",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "11", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "11", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "12", "63",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "12", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "12", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "13", "63",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "13", "32",
- "MKK", "2.4G", "20M", "OFDM", "1T", "13", "32",
- "FCC", "2.4G", "20M", "OFDM", "1T", "14", "63",
- "ETSI", "2.4G", "20M", "OFDM", "1T", "14", "63",
- "MKK", "2.4G", "20M", "OFDM", "1T", "14", "63",
- "FCC", "2.4G", "20M", "HT", "1T", "01", "26",
- "ETSI", "2.4G", "20M", "HT", "1T", "01", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "01", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "02", "26",
- "ETSI", "2.4G", "20M", "HT", "1T", "02", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "02", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "03", "32",
- "ETSI", "2.4G", "20M", "HT", "1T", "03", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "03", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "04", "32",
- "ETSI", "2.4G", "20M", "HT", "1T", "04", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "04", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "05", "32",
- "ETSI", "2.4G", "20M", "HT", "1T", "05", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "05", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "06", "32",
- "ETSI", "2.4G", "20M", "HT", "1T", "06", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "06", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "07", "32",
- "ETSI", "2.4G", "20M", "HT", "1T", "07", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "07", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "08", "32",
- "ETSI", "2.4G", "20M", "HT", "1T", "08", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "08", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "09", "32",
- "ETSI", "2.4G", "20M", "HT", "1T", "09", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "09", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "10", "26",
- "ETSI", "2.4G", "20M", "HT", "1T", "10", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "10", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "11", "26",
- "ETSI", "2.4G", "20M", "HT", "1T", "11", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "11", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "12", "63",
- "ETSI", "2.4G", "20M", "HT", "1T", "12", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "12", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "13", "63",
- "ETSI", "2.4G", "20M", "HT", "1T", "13", "32",
- "MKK", "2.4G", "20M", "HT", "1T", "13", "32",
- "FCC", "2.4G", "20M", "HT", "1T", "14", "63",
- "ETSI", "2.4G", "20M", "HT", "1T", "14", "63",
- "MKK", "2.4G", "20M", "HT", "1T", "14", "63",
- "FCC", "2.4G", "20M", "HT", "2T", "01", "30",
- "ETSI", "2.4G", "20M", "HT", "2T", "01", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "01", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "02", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "02", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "02", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "03", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "03", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "03", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "04", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "04", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "04", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "05", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "05", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "05", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "06", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "06", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "06", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "07", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "07", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "07", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "08", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "08", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "08", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "09", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "09", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "09", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "10", "32",
- "ETSI", "2.4G", "20M", "HT", "2T", "10", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "10", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "11", "30",
- "ETSI", "2.4G", "20M", "HT", "2T", "11", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "11", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "12", "63",
- "ETSI", "2.4G", "20M", "HT", "2T", "12", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "12", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "13", "63",
- "ETSI", "2.4G", "20M", "HT", "2T", "13", "32",
- "MKK", "2.4G", "20M", "HT", "2T", "13", "32",
- "FCC", "2.4G", "20M", "HT", "2T", "14", "63",
- "ETSI", "2.4G", "20M", "HT", "2T", "14", "63",
- "MKK", "2.4G", "20M", "HT", "2T", "14", "63",
- "FCC", "2.4G", "40M", "HT", "1T", "01", "63",
- "ETSI", "2.4G", "40M", "HT", "1T", "01", "63",
- "MKK", "2.4G", "40M", "HT", "1T", "01", "63",
- "FCC", "2.4G", "40M", "HT", "1T", "02", "63",
- "ETSI", "2.4G", "40M", "HT", "1T", "02", "63",
- "MKK", "2.4G", "40M", "HT", "1T", "02", "63",
- "FCC", "2.4G", "40M", "HT", "1T", "03", "26",
- "ETSI", "2.4G", "40M", "HT", "1T", "03", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "03", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "04", "26",
- "ETSI", "2.4G", "40M", "HT", "1T", "04", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "04", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "05", "32",
- "ETSI", "2.4G", "40M", "HT", "1T", "05", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "05", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "06", "32",
- "ETSI", "2.4G", "40M", "HT", "1T", "06", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "06", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "07", "32",
- "ETSI", "2.4G", "40M", "HT", "1T", "07", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "07", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "08", "26",
- "ETSI", "2.4G", "40M", "HT", "1T", "08", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "08", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "09", "26",
- "ETSI", "2.4G", "40M", "HT", "1T", "09", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "09", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "10", "26",
- "ETSI", "2.4G", "40M", "HT", "1T", "10", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "10", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "11", "26",
- "ETSI", "2.4G", "40M", "HT", "1T", "11", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "11", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "12", "63",
- "ETSI", "2.4G", "40M", "HT", "1T", "12", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "12", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "13", "63",
- "ETSI", "2.4G", "40M", "HT", "1T", "13", "32",
- "MKK", "2.4G", "40M", "HT", "1T", "13", "32",
- "FCC", "2.4G", "40M", "HT", "1T", "14", "63",
- "ETSI", "2.4G", "40M", "HT", "1T", "14", "63",
- "MKK", "2.4G", "40M", "HT", "1T", "14", "63",
- "FCC", "2.4G", "40M", "HT", "2T", "01", "63",
- "ETSI", "2.4G", "40M", "HT", "2T", "01", "63",
- "MKK", "2.4G", "40M", "HT", "2T", "01", "63",
- "FCC", "2.4G", "40M", "HT", "2T", "02", "63",
- "ETSI", "2.4G", "40M", "HT", "2T", "02", "63",
- "MKK", "2.4G", "40M", "HT", "2T", "02", "63",
- "FCC", "2.4G", "40M", "HT", "2T", "03", "30",
- "ETSI", "2.4G", "40M", "HT", "2T", "03", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "03", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "04", "32",
- "ETSI", "2.4G", "40M", "HT", "2T", "04", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "04", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "05", "32",
- "ETSI", "2.4G", "40M", "HT", "2T", "05", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "05", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "06", "32",
- "ETSI", "2.4G", "40M", "HT", "2T", "06", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "06", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "07", "32",
- "ETSI", "2.4G", "40M", "HT", "2T", "07", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "07", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "08", "32",
- "ETSI", "2.4G", "40M", "HT", "2T", "08", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "08", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "09", "32",
- "ETSI", "2.4G", "40M", "HT", "2T", "09", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "09", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "10", "32",
- "ETSI", "2.4G", "40M", "HT", "2T", "10", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "10", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "11", "30",
- "ETSI", "2.4G", "40M", "HT", "2T", "11", "30",
- "MKK", "2.4G", "40M", "HT", "2T", "11", "30",
- "FCC", "2.4G", "40M", "HT", "2T", "12", "63",
- "ETSI", "2.4G", "40M", "HT", "2T", "12", "32",
- "MKK", "2.4G", "40M", "HT", "2T", "12", "32",
- "FCC", "2.4G", "40M", "HT", "2T", "13", "63",
- "ETSI", "2.4G", "40M", "HT", "2T", "13", "32",
- "MKK", "2.4G", "40M", "HT", "2T", "13", "32",
- "FCC", "2.4G", "40M", "HT", "2T", "14", "63",
- "ETSI", "2.4G", "40M", "HT", "2T", "14", "63",
- "MKK", "2.4G", "40M", "HT", "2T", "14", "63"
+ "FCC", "20M", "CCK", "1T", "01", "32",
+ "ETSI", "20M", "CCK", "1T", "01", "32",
+ "MKK", "20M", "CCK", "1T", "01", "32",
+ "FCC", "20M", "CCK", "1T", "02", "32",
+ "ETSI", "20M", "CCK", "1T", "02", "32",
+ "MKK", "20M", "CCK", "1T", "02", "32",
+ "FCC", "20M", "CCK", "1T", "03", "32",
+ "ETSI", "20M", "CCK", "1T", "03", "32",
+ "MKK", "20M", "CCK", "1T", "03", "32",
+ "FCC", "20M", "CCK", "1T", "04", "32",
+ "ETSI", "20M", "CCK", "1T", "04", "32",
+ "MKK", "20M", "CCK", "1T", "04", "32",
+ "FCC", "20M", "CCK", "1T", "05", "32",
+ "ETSI", "20M", "CCK", "1T", "05", "32",
+ "MKK", "20M", "CCK", "1T", "05", "32",
+ "FCC", "20M", "CCK", "1T", "06", "32",
+ "ETSI", "20M", "CCK", "1T", "06", "32",
+ "MKK", "20M", "CCK", "1T", "06", "32",
+ "FCC", "20M", "CCK", "1T", "07", "32",
+ "ETSI", "20M", "CCK", "1T", "07", "32",
+ "MKK", "20M", "CCK", "1T", "07", "32",
+ "FCC", "20M", "CCK", "1T", "08", "32",
+ "ETSI", "20M", "CCK", "1T", "08", "32",
+ "MKK", "20M", "CCK", "1T", "08", "32",
+ "FCC", "20M", "CCK", "1T", "09", "32",
+ "ETSI", "20M", "CCK", "1T", "09", "32",
+ "MKK", "20M", "CCK", "1T", "09", "32",
+ "FCC", "20M", "CCK", "1T", "10", "32",
+ "ETSI", "20M", "CCK", "1T", "10", "32",
+ "MKK", "20M", "CCK", "1T", "10", "32",
+ "FCC", "20M", "CCK", "1T", "11", "32",
+ "ETSI", "20M", "CCK", "1T", "11", "32",
+ "MKK", "20M", "CCK", "1T", "11", "32",
+ "FCC", "20M", "CCK", "1T", "12", "63",
+ "ETSI", "20M", "CCK", "1T", "12", "32",
+ "MKK", "20M", "CCK", "1T", "12", "32",
+ "FCC", "20M", "CCK", "1T", "13", "63",
+ "ETSI", "20M", "CCK", "1T", "13", "32",
+ "MKK", "20M", "CCK", "1T", "13", "32",
+ "FCC", "20M", "CCK", "1T", "14", "63",
+ "ETSI", "20M", "CCK", "1T", "14", "63",
+ "MKK", "20M", "CCK", "1T", "14", "32",
+ "FCC", "20M", "OFDM", "1T", "01", "28",
+ "ETSI", "20M", "OFDM", "1T", "01", "32",
+ "MKK", "20M", "OFDM", "1T", "01", "32",
+ "FCC", "20M", "OFDM", "1T", "02", "28",
+ "ETSI", "20M", "OFDM", "1T", "02", "32",
+ "MKK", "20M", "OFDM", "1T", "02", "32",
+ "FCC", "20M", "OFDM", "1T", "03", "32",
+ "ETSI", "20M", "OFDM", "1T", "03", "32",
+ "MKK", "20M", "OFDM", "1T", "03", "32",
+ "FCC", "20M", "OFDM", "1T", "04", "32",
+ "ETSI", "20M", "OFDM", "1T", "04", "32",
+ "MKK", "20M", "OFDM", "1T", "04", "32",
+ "FCC", "20M", "OFDM", "1T", "05", "32",
+ "ETSI", "20M", "OFDM", "1T", "05", "32",
+ "MKK", "20M", "OFDM", "1T", "05", "32",
+ "FCC", "20M", "OFDM", "1T", "06", "32",
+ "ETSI", "20M", "OFDM", "1T", "06", "32",
+ "MKK", "20M", "OFDM", "1T", "06", "32",
+ "FCC", "20M", "OFDM", "1T", "07", "32",
+ "ETSI", "20M", "OFDM", "1T", "07", "32",
+ "MKK", "20M", "OFDM", "1T", "07", "32",
+ "FCC", "20M", "OFDM", "1T", "08", "32",
+ "ETSI", "20M", "OFDM", "1T", "08", "32",
+ "MKK", "20M", "OFDM", "1T", "08", "32",
+ "FCC", "20M", "OFDM", "1T", "09", "32",
+ "ETSI", "20M", "OFDM", "1T", "09", "32",
+ "MKK", "20M", "OFDM", "1T", "09", "32",
+ "FCC", "20M", "OFDM", "1T", "10", "28",
+ "ETSI", "20M", "OFDM", "1T", "10", "32",
+ "MKK", "20M", "OFDM", "1T", "10", "32",
+ "FCC", "20M", "OFDM", "1T", "11", "28",
+ "ETSI", "20M", "OFDM", "1T", "11", "32",
+ "MKK", "20M", "OFDM", "1T", "11", "32",
+ "FCC", "20M", "OFDM", "1T", "12", "63",
+ "ETSI", "20M", "OFDM", "1T", "12", "32",
+ "MKK", "20M", "OFDM", "1T", "12", "32",
+ "FCC", "20M", "OFDM", "1T", "13", "63",
+ "ETSI", "20M", "OFDM", "1T", "13", "32",
+ "MKK", "20M", "OFDM", "1T", "13", "32",
+ "FCC", "20M", "OFDM", "1T", "14", "63",
+ "ETSI", "20M", "OFDM", "1T", "14", "63",
+ "MKK", "20M", "OFDM", "1T", "14", "63",
+ "FCC", "20M", "HT", "1T", "01", "26",
+ "ETSI", "20M", "HT", "1T", "01", "32",
+ "MKK", "20M", "HT", "1T", "01", "32",
+ "FCC", "20M", "HT", "1T", "02", "26",
+ "ETSI", "20M", "HT", "1T", "02", "32",
+ "MKK", "20M", "HT", "1T", "02", "32",
+ "FCC", "20M", "HT", "1T", "03", "32",
+ "ETSI", "20M", "HT", "1T", "03", "32",
+ "MKK", "20M", "HT", "1T", "03", "32",
+ "FCC", "20M", "HT", "1T", "04", "32",
+ "ETSI", "20M", "HT", "1T", "04", "32",
+ "MKK", "20M", "HT", "1T", "04", "32",
+ "FCC", "20M", "HT", "1T", "05", "32",
+ "ETSI", "20M", "HT", "1T", "05", "32",
+ "MKK", "20M", "HT", "1T", "05", "32",
+ "FCC", "20M", "HT", "1T", "06", "32",
+ "ETSI", "20M", "HT", "1T", "06", "32",
+ "MKK", "20M", "HT", "1T", "06", "32",
+ "FCC", "20M", "HT", "1T", "07", "32",
+ "ETSI", "20M", "HT", "1T", "07", "32",
+ "MKK", "20M", "HT", "1T", "07", "32",
+ "FCC", "20M", "HT", "1T", "08", "32",
+ "ETSI", "20M", "HT", "1T", "08", "32",
+ "MKK", "20M", "HT", "1T", "08", "32",
+ "FCC", "20M", "HT", "1T", "09", "32",
+ "ETSI", "20M", "HT", "1T", "09", "32",
+ "MKK", "20M", "HT", "1T", "09", "32",
+ "FCC", "20M", "HT", "1T", "10", "26",
+ "ETSI", "20M", "HT", "1T", "10", "32",
+ "MKK", "20M", "HT", "1T", "10", "32",
+ "FCC", "20M", "HT", "1T", "11", "26",
+ "ETSI", "20M", "HT", "1T", "11", "32",
+ "MKK", "20M", "HT", "1T", "11", "32",
+ "FCC", "20M", "HT", "1T", "12", "63",
+ "ETSI", "20M", "HT", "1T", "12", "32",
+ "MKK", "20M", "HT", "1T", "12", "32",
+ "FCC", "20M", "HT", "1T", "13", "63",
+ "ETSI", "20M", "HT", "1T", "13", "32",
+ "MKK", "20M", "HT", "1T", "13", "32",
+ "FCC", "20M", "HT", "1T", "14", "63",
+ "ETSI", "20M", "HT", "1T", "14", "63",
+ "MKK", "20M", "HT", "1T", "14", "63",
+ "FCC", "20M", "HT", "2T", "01", "30",
+ "ETSI", "20M", "HT", "2T", "01", "32",
+ "MKK", "20M", "HT", "2T", "01", "32",
+ "FCC", "20M", "HT", "2T", "02", "32",
+ "ETSI", "20M", "HT", "2T", "02", "32",
+ "MKK", "20M", "HT", "2T", "02", "32",
+ "FCC", "20M", "HT", "2T", "03", "32",
+ "ETSI", "20M", "HT", "2T", "03", "32",
+ "MKK", "20M", "HT", "2T", "03", "32",
+ "FCC", "20M", "HT", "2T", "04", "32",
+ "ETSI", "20M", "HT", "2T", "04", "32",
+ "MKK", "20M", "HT", "2T", "04", "32",
+ "FCC", "20M", "HT", "2T", "05", "32",
+ "ETSI", "20M", "HT", "2T", "05", "32",
+ "MKK", "20M", "HT", "2T", "05", "32",
+ "FCC", "20M", "HT", "2T", "06", "32",
+ "ETSI", "20M", "HT", "2T", "06", "32",
+ "MKK", "20M", "HT", "2T", "06", "32",
+ "FCC", "20M", "HT", "2T", "07", "32",
+ "ETSI", "20M", "HT", "2T", "07", "32",
+ "MKK", "20M", "HT", "2T", "07", "32",
+ "FCC", "20M", "HT", "2T", "08", "32",
+ "ETSI", "20M", "HT", "2T", "08", "32",
+ "MKK", "20M", "HT", "2T", "08", "32",
+ "FCC", "20M", "HT", "2T", "09", "32",
+ "ETSI", "20M", "HT", "2T", "09", "32",
+ "MKK", "20M", "HT", "2T", "09", "32",
+ "FCC", "20M", "HT", "2T", "10", "32",
+ "ETSI", "20M", "HT", "2T", "10", "32",
+ "MKK", "20M", "HT", "2T", "10", "32",
+ "FCC", "20M", "HT", "2T", "11", "30",
+ "ETSI", "20M", "HT", "2T", "11", "32",
+ "MKK", "20M", "HT", "2T", "11", "32",
+ "FCC", "20M", "HT", "2T", "12", "63",
+ "ETSI", "20M", "HT", "2T", "12", "32",
+ "MKK", "20M", "HT", "2T", "12", "32",
+ "FCC", "20M", "HT", "2T", "13", "63",
+ "ETSI", "20M", "HT", "2T", "13", "32",
+ "MKK", "20M", "HT", "2T", "13", "32",
+ "FCC", "20M", "HT", "2T", "14", "63",
+ "ETSI", "20M", "HT", "2T", "14", "63",
+ "MKK", "20M", "HT", "2T", "14", "63",
+ "FCC", "40M", "HT", "1T", "01", "63",
+ "ETSI", "40M", "HT", "1T", "01", "63",
+ "MKK", "40M", "HT", "1T", "01", "63",
+ "FCC", "40M", "HT", "1T", "02", "63",
+ "ETSI", "40M", "HT", "1T", "02", "63",
+ "MKK", "40M", "HT", "1T", "02", "63",
+ "FCC", "40M", "HT", "1T", "03", "26",
+ "ETSI", "40M", "HT", "1T", "03", "32",
+ "MKK", "40M", "HT", "1T", "03", "32",
+ "FCC", "40M", "HT", "1T", "04", "26",
+ "ETSI", "40M", "HT", "1T", "04", "32",
+ "MKK", "40M", "HT", "1T", "04", "32",
+ "FCC", "40M", "HT", "1T", "05", "32",
+ "ETSI", "40M", "HT", "1T", "05", "32",
+ "MKK", "40M", "HT", "1T", "05", "32",
+ "FCC", "40M", "HT", "1T", "06", "32",
+ "ETSI", "40M", "HT", "1T", "06", "32",
+ "MKK", "40M", "HT", "1T", "06", "32",
+ "FCC", "40M", "HT", "1T", "07", "32",
+ "ETSI", "40M", "HT", "1T", "07", "32",
+ "MKK", "40M", "HT", "1T", "07", "32",
+ "FCC", "40M", "HT", "1T", "08", "26",
+ "ETSI", "40M", "HT", "1T", "08", "32",
+ "MKK", "40M", "HT", "1T", "08", "32",
+ "FCC", "40M", "HT", "1T", "09", "26",
+ "ETSI", "40M", "HT", "1T", "09", "32",
+ "MKK", "40M", "HT", "1T", "09", "32",
+ "FCC", "40M", "HT", "1T", "10", "26",
+ "ETSI", "40M", "HT", "1T", "10", "32",
+ "MKK", "40M", "HT", "1T", "10", "32",
+ "FCC", "40M", "HT", "1T", "11", "26",
+ "ETSI", "40M", "HT", "1T", "11", "32",
+ "MKK", "40M", "HT", "1T", "11", "32",
+ "FCC", "40M", "HT", "1T", "12", "63",
+ "ETSI", "40M", "HT", "1T", "12", "32",
+ "MKK", "40M", "HT", "1T", "12", "32",
+ "FCC", "40M", "HT", "1T", "13", "63",
+ "ETSI", "40M", "HT", "1T", "13", "32",
+ "MKK", "40M", "HT", "1T", "13", "32",
+ "FCC", "40M", "HT", "1T", "14", "63",
+ "ETSI", "40M", "HT", "1T", "14", "63",
+ "MKK", "40M", "HT", "1T", "14", "63",
+ "FCC", "40M", "HT", "2T", "01", "63",
+ "ETSI", "40M", "HT", "2T", "01", "63",
+ "MKK", "40M", "HT", "2T", "01", "63",
+ "FCC", "40M", "HT", "2T", "02", "63",
+ "ETSI", "40M", "HT", "2T", "02", "63",
+ "MKK", "40M", "HT", "2T", "02", "63",
+ "FCC", "40M", "HT", "2T", "03", "30",
+ "ETSI", "40M", "HT", "2T", "03", "30",
+ "MKK", "40M", "HT", "2T", "03", "30",
+ "FCC", "40M", "HT", "2T", "04", "32",
+ "ETSI", "40M", "HT", "2T", "04", "30",
+ "MKK", "40M", "HT", "2T", "04", "30",
+ "FCC", "40M", "HT", "2T", "05", "32",
+ "ETSI", "40M", "HT", "2T", "05", "30",
+ "MKK", "40M", "HT", "2T", "05", "30",
+ "FCC", "40M", "HT", "2T", "06", "32",
+ "ETSI", "40M", "HT", "2T", "06", "30",
+ "MKK", "40M", "HT", "2T", "06", "30",
+ "FCC", "40M", "HT", "2T", "07", "32",
+ "ETSI", "40M", "HT", "2T", "07", "30",
+ "MKK", "40M", "HT", "2T", "07", "30",
+ "FCC", "40M", "HT", "2T", "08", "32",
+ "ETSI", "40M", "HT", "2T", "08", "30",
+ "MKK", "40M", "HT", "2T", "08", "30",
+ "FCC", "40M", "HT", "2T", "09", "32",
+ "ETSI", "40M", "HT", "2T", "09", "30",
+ "MKK", "40M", "HT", "2T", "09", "30",
+ "FCC", "40M", "HT", "2T", "10", "32",
+ "ETSI", "40M", "HT", "2T", "10", "30",
+ "MKK", "40M", "HT", "2T", "10", "30",
+ "FCC", "40M", "HT", "2T", "11", "30",
+ "ETSI", "40M", "HT", "2T", "11", "30",
+ "MKK", "40M", "HT", "2T", "11", "30",
+ "FCC", "40M", "HT", "2T", "12", "63",
+ "ETSI", "40M", "HT", "2T", "12", "32",
+ "MKK", "40M", "HT", "2T", "12", "32",
+ "FCC", "40M", "HT", "2T", "13", "63",
+ "ETSI", "40M", "HT", "2T", "13", "32",
+ "MKK", "40M", "HT", "2T", "13", "32",
+ "FCC", "40M", "HT", "2T", "14", "63",
+ "ETSI", "40M", "HT", "2T", "14", "63",
+ "MKK", "40M", "HT", "2T", "14", "63"
};
void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct dm_odm_t *pDM_Odm)
@@ -704,19 +704,17 @@ void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct dm_odm_t *pDM_Odm)
u32 i = 0;
u8 **Array = Array_MP_8723B_TXPWR_LMT;
- for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_TXPWR_LMT); i += 7) {
+ for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_TXPWR_LMT); i += 6) {
u8 *regulation = Array[i];
- u8 *band = Array[i+1];
- u8 *bandwidth = Array[i+2];
- u8 *rate = Array[i+3];
- u8 *rfPath = Array[i+4];
- u8 *chnl = Array[i+5];
- u8 *val = Array[i+6];
+ u8 *bandwidth = Array[i+1];
+ u8 *rate = Array[i+2];
+ u8 *rfPath = Array[i+3];
+ u8 *chnl = Array[i+4];
+ u8 *val = Array[i+5];
odm_ConfigBB_TXPWR_LMT_8723B(
pDM_Odm,
regulation,
- band,
bandwidth,
rate,
rfPath,
diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index 1b0f47b58110..9fa91023abfd 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -69,7 +69,7 @@ static void setIqkMatrix_8723B(
ele_D = (OFDMSwingTable_New[OFDM_index] & 0xFFC00000)>>22;
/* new element A = element D x X */
- if ((IqkResult_X != 0) && (*(pDM_Odm->pBandType) == ODM_BAND_2_4G)) {
+ if (IqkResult_X != 0) {
if ((IqkResult_X & 0x00000200) != 0) /* consider minus */
IqkResult_X = IqkResult_X | 0xFFFFFC00;
ele_A = ((IqkResult_X * ele_D)>>8)&0x000003FF;
diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index da545c4eaac0..3b0573885dce 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -368,10 +368,6 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)
*pu8 = false;
break;
- case BTC_GET_BL_WIFI_UNDER_5G:
- *pu8 = pHalData->CurrentBandType == 1;
- break;
-
case BTC_GET_BL_WIFI_AP_MODE_ENABLE:
*pu8 = check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE);
break;
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 56e657d2aaac..732659a2d844 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -11,7 +11,7 @@
#include <hal_data.h>
#include <linux/kernel.h>
-u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,
+u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
u8 TxNum, enum rate_section RateSection)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
@@ -20,73 +20,39 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,
if (RfPath > ODM_RF_PATH_D)
return 0;
- if (Band == BAND_ON_2_4G) {
- switch (RateSection) {
- case CCK:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][0];
- break;
- case OFDM:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][1];
- break;
- case HT_MCS0_MCS7:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][2];
- break;
- case HT_MCS8_MCS15:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][3];
- break;
- case HT_MCS16_MCS23:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][4];
- break;
- case HT_MCS24_MCS31:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
- break;
- case VHT_1SSMCS0_1SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
- break;
- case VHT_2SSMCS0_2SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
- break;
- case VHT_3SSMCS0_3SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
- break;
- case VHT_4SSMCS0_4SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
- break;
- default:
- break;
- }
- } else if (Band == BAND_ON_5G) {
- switch (RateSection) {
- case OFDM:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][0];
- break;
- case HT_MCS0_MCS7:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][1];
- break;
- case HT_MCS8_MCS15:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][2];
- break;
- case HT_MCS16_MCS23:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][3];
- break;
- case HT_MCS24_MCS31:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][4];
- break;
- case VHT_1SSMCS0_1SSMCS9:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][5];
- break;
- case VHT_2SSMCS0_2SSMCS9:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][6];
- break;
- case VHT_3SSMCS0_3SSMCS9:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][7];
- break;
- case VHT_4SSMCS0_4SSMCS9:
- value = pHalData->TxPwrByRateBase5G[RfPath][TxNum][8];
- break;
- default:
- break;
- }
+ switch (RateSection) {
+ case CCK:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][0];
+ break;
+ case OFDM:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][1];
+ break;
+ case HT_MCS0_MCS7:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][2];
+ break;
+ case HT_MCS8_MCS15:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][3];
+ break;
+ case HT_MCS16_MCS23:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][4];
+ break;
+ case HT_MCS24_MCS31:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
+ break;
+ case VHT_1SSMCS0_1SSMCS9:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
+ break;
+ case VHT_2SSMCS0_2SSMCS9:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
+ break;
+ case VHT_3SSMCS0_3SSMCS9:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
+ break;
+ case VHT_4SSMCS0_4SSMCS9:
+ value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
+ break;
+ default:
+ break;
}
return value;
@@ -95,7 +61,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 Band, u8 RfPath,
static void
phy_SetTxPowerByRateBase(
struct adapter *Adapter,
- u8 Band,
u8 RfPath,
enum rate_section RateSection,
u8 TxNum,
@@ -107,73 +72,39 @@ phy_SetTxPowerByRateBase(
if (RfPath > ODM_RF_PATH_D)
return;
- if (Band == BAND_ON_2_4G) {
- switch (RateSection) {
- case CCK:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][0] = Value;
- break;
- case OFDM:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][1] = Value;
- break;
- case HT_MCS0_MCS7:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][2] = Value;
- break;
- case HT_MCS8_MCS15:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][3] = Value;
- break;
- case HT_MCS16_MCS23:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][4] = Value;
- break;
- case HT_MCS24_MCS31:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
- break;
- case VHT_1SSMCS0_1SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
- break;
- case VHT_2SSMCS0_2SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
- break;
- case VHT_3SSMCS0_3SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
- break;
- case VHT_4SSMCS0_4SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
- break;
- default:
- break;
- }
- } else if (Band == BAND_ON_5G) {
- switch (RateSection) {
- case OFDM:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][0] = Value;
- break;
- case HT_MCS0_MCS7:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][1] = Value;
- break;
- case HT_MCS8_MCS15:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][2] = Value;
- break;
- case HT_MCS16_MCS23:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][3] = Value;
- break;
- case HT_MCS24_MCS31:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][4] = Value;
- break;
- case VHT_1SSMCS0_1SSMCS9:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][5] = Value;
- break;
- case VHT_2SSMCS0_2SSMCS9:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][6] = Value;
- break;
- case VHT_3SSMCS0_3SSMCS9:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][7] = Value;
- break;
- case VHT_4SSMCS0_4SSMCS9:
- pHalData->TxPwrByRateBase5G[RfPath][TxNum][8] = Value;
- break;
- default:
- break;
- }
+ switch (RateSection) {
+ case CCK:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][0] = Value;
+ break;
+ case OFDM:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][1] = Value;
+ break;
+ case HT_MCS0_MCS7:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][2] = Value;
+ break;
+ case HT_MCS8_MCS15:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][3] = Value;
+ break;
+ case HT_MCS16_MCS23:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][4] = Value;
+ break;
+ case HT_MCS24_MCS31:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
+ break;
+ case VHT_1SSMCS0_1SSMCS9:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
+ break;
+ case VHT_2SSMCS0_2SSMCS9:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
+ break;
+ case VHT_3SSMCS0_3SSMCS9:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
+ break;
+ case VHT_4SSMCS0_4SSMCS9:
+ pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
+ break;
+ default:
+ break;
}
}
@@ -185,50 +116,29 @@ struct adapter *padapter
u8 path, base;
for (path = ODM_RF_PATH_A; path <= ODM_RF_PATH_B; ++path) {
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_1TX, MGN_11M);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, CCK, RF_1TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_1TX, MGN_54M);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, OFDM, RF_1TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_11M);
+ phy_SetTxPowerByRateBase(padapter, path, CCK, RF_1TX, base);
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_1TX, MGN_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, HT_MCS0_MCS7, RF_1TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_54M);
+ phy_SetTxPowerByRateBase(padapter, path, OFDM, RF_1TX, base);
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_2TX, MGN_MCS15);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, HT_MCS8_MCS15, RF_2TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_MCS7);
+ phy_SetTxPowerByRateBase(padapter, path, HT_MCS0_MCS7, RF_1TX, base);
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_3TX, MGN_MCS23);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, HT_MCS16_MCS23, RF_3TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_MCS15);
+ phy_SetTxPowerByRateBase(padapter, path, HT_MCS8_MCS15, RF_2TX, base);
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_1TX, MGN_VHT1SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
+ phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_2TX, MGN_VHT2SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
+ phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, path, RF_3TX, MGN_VHT3SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_2_4G, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
+ phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_5G, path, RF_1TX, MGN_54M);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_5G, path, OFDM, RF_1TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_5G, path, RF_1TX, MGN_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_5G, path, HT_MCS0_MCS7, RF_1TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_5G, path, RF_2TX, MGN_MCS15);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_5G, path, HT_MCS8_MCS15, RF_2TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_5G, path, RF_3TX, MGN_MCS23);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_5G, path, HT_MCS16_MCS23, RF_3TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_5G, path, RF_1TX, MGN_VHT1SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_5G, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_5G, path, RF_2TX, MGN_VHT2SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_5G, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, BAND_ON_5G, path, RF_3TX, MGN_VHT2SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, BAND_ON_5G, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
+ base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
+ phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
}
}
@@ -687,7 +597,6 @@ PHY_GetRateValuesOfTxPowerByRate(
static void PHY_StoreTxPowerByRateNew(
struct adapter *padapter,
- u32 Band,
u32 RfPath,
u32 TxNum,
u32 RegAddr,
@@ -701,9 +610,6 @@ static void PHY_StoreTxPowerByRateNew(
PHY_GetRateValuesOfTxPowerByRate(padapter, RegAddr, BitMask, Data, rateIndex, PwrByRateVal, &rateNum);
- if (Band != BAND_ON_2_4G && Band != BAND_ON_5G)
- return;
-
if (RfPath > ODM_RF_PATH_D)
return;
@@ -715,7 +621,7 @@ static void PHY_StoreTxPowerByRateNew(
rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1))
TxNum = RF_2TX;
- pHalData->TxPwrByRateOffset[Band][RfPath][TxNum][rateIndex[i]] = PwrByRateVal[i];
+ pHalData->TxPwrByRateOffset[RfPath][TxNum][rateIndex[i]] = PwrByRateVal[i];
}
}
@@ -732,18 +638,16 @@ static void PHY_StoreTxPowerByRateOld(
void PHY_InitTxPowerByRate(struct adapter *padapter)
{
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
- u8 band, rfPath, TxNum, rate;
+ u8 rfPath, TxNum, rate;
- for (band = BAND_ON_2_4G; band <= BAND_ON_5G; ++band)
- for (rfPath = 0; rfPath < TX_PWR_BY_RATE_NUM_RF; ++rfPath)
- for (TxNum = 0; TxNum < TX_PWR_BY_RATE_NUM_RF; ++TxNum)
- for (rate = 0; rate < TX_PWR_BY_RATE_NUM_RATE; ++rate)
- pHalData->TxPwrByRateOffset[band][rfPath][TxNum][rate] = 0;
+ for (rfPath = 0; rfPath < TX_PWR_BY_RATE_NUM_RF; ++rfPath)
+ for (TxNum = 0; TxNum < TX_PWR_BY_RATE_NUM_RF; ++TxNum)
+ for (rate = 0; rate < TX_PWR_BY_RATE_NUM_RATE; ++rate)
+ pHalData->TxPwrByRateOffset[rfPath][TxNum][rate] = 0;
}
void PHY_StoreTxPowerByRate(
struct adapter *padapter,
- u32 Band,
u32 RfPath,
u32 TxNum,
u32 RegAddr,
@@ -755,7 +659,7 @@ void PHY_StoreTxPowerByRate(
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
if (pDM_Odm->PhyRegPgVersion > 0)
- PHY_StoreTxPowerByRateNew(padapter, Band, RfPath, TxNum, RegAddr, BitMask, Data);
+ PHY_StoreTxPowerByRateNew(padapter, RfPath, TxNum, RegAddr, BitMask, Data);
else if (pDM_Odm->PhyRegPgVersion == 0) {
PHY_StoreTxPowerByRateOld(padapter, RegAddr, BitMask, Data);
@@ -771,7 +675,7 @@ phy_ConvertTxPowerByRateInDbmToRelativeValues(
struct adapter *padapter
)
{
- u8 base = 0, i = 0, value = 0, band = 0, path = 0, txNum = 0;
+ u8 base = 0, i = 0, value = 0, path = 0, txNum = 0;
u8 cckRates[4] = {
MGN_1M, MGN_2M, MGN_5_5M, MGN_11M
};
@@ -800,64 +704,62 @@ struct adapter *padapter
MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9
};
- for (band = BAND_ON_2_4G; band <= BAND_ON_5G; ++band) {
- for (path = ODM_RF_PATH_A; path <= ODM_RF_PATH_D; ++path) {
- for (txNum = RF_1TX; txNum < RF_MAX_TX_NUM; ++txNum) {
- /* CCK */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_11M);
- for (i = 0; i < ARRAY_SIZE(cckRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, cckRates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, cckRates[i], value - base);
- }
+ for (path = ODM_RF_PATH_A; path <= ODM_RF_PATH_D; ++path) {
+ for (txNum = RF_1TX; txNum < RF_MAX_TX_NUM; ++txNum) {
+ /* CCK */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_11M);
+ for (i = 0; i < ARRAY_SIZE(cckRates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, cckRates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, cckRates[i], value - base);
+ }
- /* OFDM */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_54M);
- for (i = 0; i < sizeof(ofdmRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, ofdmRates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, ofdmRates[i], value - base);
- }
+ /* OFDM */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_54M);
+ for (i = 0; i < sizeof(ofdmRates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, ofdmRates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, ofdmRates[i], value - base);
+ }
- /* HT MCS0~7 */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_MCS7);
- for (i = 0; i < sizeof(mcs0_7Rates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, mcs0_7Rates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, mcs0_7Rates[i], value - base);
- }
+ /* HT MCS0~7 */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_MCS7);
+ for (i = 0; i < sizeof(mcs0_7Rates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, mcs0_7Rates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, mcs0_7Rates[i], value - base);
+ }
- /* HT MCS8~15 */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_MCS15);
- for (i = 0; i < sizeof(mcs8_15Rates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, mcs8_15Rates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, mcs8_15Rates[i], value - base);
- }
+ /* HT MCS8~15 */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_MCS15);
+ for (i = 0; i < sizeof(mcs8_15Rates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, mcs8_15Rates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, mcs8_15Rates[i], value - base);
+ }
- /* HT MCS16~23 */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_MCS23);
- for (i = 0; i < sizeof(mcs16_23Rates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, mcs16_23Rates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, mcs16_23Rates[i], value - base);
- }
+ /* HT MCS16~23 */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_MCS23);
+ for (i = 0; i < sizeof(mcs16_23Rates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i], value - base);
+ }
- /* VHT 1SS */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_VHT1SS_MCS7);
- for (i = 0; i < sizeof(vht1ssRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, vht1ssRates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, vht1ssRates[i], value - base);
- }
+ /* VHT 1SS */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT1SS_MCS7);
+ for (i = 0; i < sizeof(vht1ssRates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, vht1ssRates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, vht1ssRates[i], value - base);
+ }
- /* VHT 2SS */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_VHT2SS_MCS7);
- for (i = 0; i < sizeof(vht2ssRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, vht2ssRates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, vht2ssRates[i], value - base);
- }
+ /* VHT 2SS */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT2SS_MCS7);
+ for (i = 0; i < sizeof(vht2ssRates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, vht2ssRates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, vht2ssRates[i], value - base);
+ }
- /* VHT 3SS */
- base = PHY_GetTxPowerByRate(padapter, band, path, txNum, MGN_VHT3SS_MCS7);
- for (i = 0; i < sizeof(vht3ssRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, band, path, txNum, vht3ssRates[i]);
- PHY_SetTxPowerByRate(padapter, band, path, txNum, vht3ssRates[i], value - base);
- }
+ /* VHT 3SS */
+ base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT3SS_MCS7);
+ for (i = 0; i < sizeof(vht3ssRates); ++i) {
+ value = PHY_GetTxPowerByRate(padapter, path, txNum, vht3ssRates[i]);
+ PHY_SetTxPowerByRate(padapter, path, txNum, vht3ssRates[i], value - base);
}
}
}
@@ -881,11 +783,10 @@ void PHY_SetTxPowerIndexByRateSection(
if (RateSection == CCK) {
u8 cckRates[] = {MGN_1M, MGN_2M, MGN_5_5M, MGN_11M};
- if (pHalData->CurrentBandType == BAND_ON_2_4G)
- PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
- pHalData->CurrentChannelBW,
- Channel, cckRates,
- ARRAY_SIZE(cckRates));
+ PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
+ pHalData->CurrentChannelBW,
+ Channel, cckRates,
+ ARRAY_SIZE(cckRates));
} else if (RateSection == OFDM) {
u8 ofdmRates[] = {MGN_6M, MGN_9M, MGN_12M, MGN_18M, MGN_24M, MGN_36M, MGN_48M, MGN_54M};
@@ -957,41 +858,12 @@ void PHY_SetTxPowerIndexByRateSection(
}
}
-static bool phy_GetChnlIndex(u8 Channel, u8 *ChannelIdx)
-{
- u8 channel5G[CHANNEL_MAX_NUMBER_5G] = {
- 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 100, 102,
- 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130,
- 132, 134, 136, 138, 140, 142, 144, 149, 151, 153, 155, 157, 159, 161,
- 163, 165, 167, 168, 169, 171, 173, 175, 177
- };
- u8 i = 0;
- bool bIn24G = true;
-
- if (Channel <= 14) {
- bIn24G = true;
- *ChannelIdx = Channel-1;
- } else {
- bIn24G = false;
-
- for (i = 0; i < ARRAY_SIZE(channel5G); ++i) {
- if (channel5G[i] == Channel) {
- *ChannelIdx = i;
- return bIn24G;
- }
- }
- }
-
- return bIn24G;
-}
-
u8 PHY_GetTxPowerIndexBase(
struct adapter *padapter,
u8 RFPath,
u8 Rate,
enum channel_width BandWidth,
- u8 Channel,
- bool *bIn24G
+ u8 Channel
)
{
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
@@ -1001,69 +873,35 @@ u8 PHY_GetTxPowerIndexBase(
if (HAL_IsLegalChannel(padapter, Channel) == false)
chnlIdx = 0;
- *bIn24G = phy_GetChnlIndex(Channel, &chnlIdx);
-
- if (*bIn24G) { /* 3 ============================== 2.4 G ============================== */
- if (IS_CCK_RATE(Rate))
- txPower = pHalData->Index24G_CCK_Base[RFPath][chnlIdx];
- else if (MGN_6M <= Rate)
- txPower = pHalData->Index24G_BW40_Base[RFPath][chnlIdx];
-
- /* OFDM-1T */
- if ((MGN_6M <= Rate && Rate <= MGN_54M) && !IS_CCK_RATE(Rate))
- txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S];
-
- if (BandWidth == CHANNEL_WIDTH_20) { /* BW20-1S, BW20-2S */
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_24G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_24G_Diff[RFPath][TX_3S];
- if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_24G_Diff[RFPath][TX_4S];
-
- } else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S];
- if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
+ if (IS_CCK_RATE(Rate))
+ txPower = pHalData->Index24G_CCK_Base[RFPath][chnlIdx];
+ else if (MGN_6M <= Rate)
+ txPower = pHalData->Index24G_BW40_Base[RFPath][chnlIdx];
+
+ /* OFDM-1T */
+ if ((MGN_6M <= Rate && Rate <= MGN_54M) && !IS_CCK_RATE(Rate))
+ txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S];
+
+ if (BandWidth == CHANNEL_WIDTH_20) { /* BW20-1S, BW20-2S */
+ if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
+ if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW20_24G_Diff[RFPath][TX_2S];
+ if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW20_24G_Diff[RFPath][TX_3S];
+ if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW20_24G_Diff[RFPath][TX_4S];
+
+ } else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */
+ if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
+ if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S];
+ if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S];
+ if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
- }
- } else {/* 3 ============================== 5 G ============================== */
- if (MGN_6M <= Rate)
- txPower = pHalData->Index5G_BW40_Base[RFPath][chnlIdx];
-
- /* OFDM-1T */
- if ((MGN_6M <= Rate && Rate <= MGN_54M) && !IS_CCK_RATE(Rate))
- txPower += pHalData->OFDM_5G_Diff[RFPath][TX_1S];
-
- /* BW20-1S, BW20-2S */
- if (BandWidth == CHANNEL_WIDTH_20) {
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_5G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_5G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_5G_Diff[RFPath][TX_3S];
- if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW20_5G_Diff[RFPath][TX_4S];
-
- } else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_5G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_5G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_5G_Diff[RFPath][TX_3S];
- if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
- txPower += pHalData->BW40_5G_Diff[RFPath][TX_4S];
-
- }
}
return txPower;
@@ -1349,7 +1187,7 @@ u8 PHY_GetRateIndexOfTxPowerByRate(u8 Rate)
}
s8 PHY_GetTxPowerByRate(
- struct adapter *padapter, u8 Band, u8 RFPath, u8 TxNum, u8 Rate
+ struct adapter *padapter, u8 RFPath, u8 TxNum, u8 Rate
)
{
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
@@ -1360,9 +1198,6 @@ s8 PHY_GetTxPowerByRate(
padapter->registrypriv.RegEnableTxPowerByRate == 0)
return 0;
- if (Band != BAND_ON_2_4G && Band != BAND_ON_5G)
- return value;
-
if (RFPath > ODM_RF_PATH_D)
return value;
@@ -1372,13 +1207,12 @@ s8 PHY_GetTxPowerByRate(
if (rateIndex >= TX_PWR_BY_RATE_NUM_RATE)
return value;
- return pHalData->TxPwrByRateOffset[Band][RFPath][TxNum][rateIndex];
+ return pHalData->TxPwrByRateOffset[RFPath][TxNum][rateIndex];
}
void PHY_SetTxPowerByRate(
struct adapter *padapter,
- u8 Band,
u8 RFPath,
u8 TxNum,
u8 Rate,
@@ -1388,9 +1222,6 @@ void PHY_SetTxPowerByRate(
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
u8 rateIndex = PHY_GetRateIndexOfTxPowerByRate(Rate);
- if (Band != BAND_ON_2_4G && Band != BAND_ON_5G)
- return;
-
if (RFPath > ODM_RF_PATH_D)
return;
@@ -1400,18 +1231,16 @@ void PHY_SetTxPowerByRate(
if (rateIndex >= TX_PWR_BY_RATE_NUM_RATE)
return;
- pHalData->TxPwrByRateOffset[Band][RFPath][TxNum][rateIndex] = Value;
+ pHalData->TxPwrByRateOffset[RFPath][TxNum][rateIndex] = Value;
}
void PHY_SetTxPowerLevelByPath(struct adapter *Adapter, u8 channel, u8 path)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
- bool bIsIn24G = (pHalData->CurrentBandType == BAND_ON_2_4G);
/* if (pMgntInfo->RegNByteAccess == 0) */
{
- if (bIsIn24G)
- PHY_SetTxPowerIndexByRateSection(Adapter, path, channel, CCK);
+ PHY_SetTxPowerIndexByRateSection(Adapter, path, channel, CCK);
PHY_SetTxPowerIndexByRateSection(Adapter, path, channel, OFDM);
PHY_SetTxPowerIndexByRateSection(Adapter, path, channel, HT_MCS0_MCS7);
@@ -1453,26 +1282,9 @@ static s8 phy_GetWorldWideLimit(s8 *LimitTable)
return min;
}
-static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Band, u8 Channel)
+static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Channel)
{
- s8 channelIndex = -1;
- u8 channel5G[CHANNEL_MAX_NUMBER_5G] = {
- 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 100, 102,
- 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130,
- 132, 134, 136, 138, 140, 142, 144, 149, 151, 153, 155, 157, 159, 161,
- 163, 165, 167, 168, 169, 171, 173, 175, 177
- };
- u8 i = 0;
- if (Band == BAND_ON_2_4G)
- channelIndex = Channel - 1;
- else if (Band == BAND_ON_5G) {
- for (i = 0; i < ARRAY_SIZE(channel5G); ++i) {
- if (channel5G[i] == Channel)
- channelIndex = i;
- }
- }
-
- return channelIndex;
+ return Channel - 1;
}
static s16 get_bandwidth_idx(const enum channel_width bandwidth)
@@ -1533,16 +1345,16 @@ static s16 get_rate_sctn_idx(const u8 rate)
}
s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
- enum band_type band_type, enum channel_width bandwidth,
+ enum channel_width bandwidth,
u8 rf_path, u8 data_rate, u8 channel)
{
- s16 idx_band = -1;
s16 idx_regulation = -1;
s16 idx_bandwidth = -1;
s16 idx_rate_sctn = -1;
s16 idx_channel = -1;
s8 pwr_lmt = MAX_POWER_INDEX;
struct hal_com_data *hal_data = GET_HAL_DATA(adapter);
+ s8 limits[10] = {0}; u8 i = 0;
if (((adapter->registrypriv.RegEnableTxPowerLimit == 2) &&
(hal_data->EEPROMRegulatory != 1)) ||
@@ -1563,17 +1375,10 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
idx_regulation = TXPWR_LMT_WW;
break;
default:
- idx_regulation = (band_type == BAND_ON_2_4G) ?
- hal_data->Regulation2_4G :
- hal_data->Regulation5G;
+ idx_regulation = hal_data->Regulation2_4G;
break;
}
- if (band_type == BAND_ON_2_4G)
- idx_band = 0;
- else if (band_type == BAND_ON_5G)
- idx_band = 1;
-
idx_bandwidth = get_bandwidth_idx(bandwidth);
idx_rate_sctn = get_rate_sctn_idx(data_rate);
@@ -1583,107 +1388,30 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
/* HT on 80M will reference to HT on 40M */
if (idx_rate_sctn == 0 || idx_rate_sctn == 1)
idx_bandwidth = 0;
- else if ((idx_rate_sctn == 2 || idx_rate_sctn == 3) &&
- (band_type == BAND_ON_5G) && (idx_bandwidth == 2))
- idx_bandwidth = 1;
- if (band_type == BAND_ON_2_4G || band_type == BAND_ON_5G)
- channel = phy_GetChannelIndexOfTxPowerLimit(band_type, channel);
+ channel = phy_GetChannelIndexOfTxPowerLimit(channel);
- if (idx_band == -1 || idx_regulation == -1 || idx_bandwidth == -1 ||
+ if (idx_regulation == -1 || idx_bandwidth == -1 ||
idx_rate_sctn == -1 || idx_channel == -1)
return MAX_POWER_INDEX;
- if (band_type == BAND_ON_2_4G) {
- s8 limits[10] = {0}; u8 i = 0;
-
- for (i = 0; i < MAX_REGULATION_NUM; i++)
- limits[i] = hal_data->TxPwrLimit_2_4G[i]
- [idx_bandwidth]
- [idx_rate_sctn]
- [idx_channel]
- [rf_path];
-
- pwr_lmt = (idx_regulation == TXPWR_LMT_WW) ?
- phy_GetWorldWideLimit(limits) :
- hal_data->TxPwrLimit_2_4G[idx_regulation]
- [idx_bandwidth]
- [idx_rate_sctn]
- [idx_channel]
- [rf_path];
-
- } else if (band_type == BAND_ON_5G) {
- s8 limits[10] = {0}; u8 i = 0;
-
- for (i = 0; i < MAX_REGULATION_NUM; ++i)
- limits[i] = hal_data->TxPwrLimit_5G[i]
- [idx_bandwidth]
- [idx_rate_sctn]
- [idx_channel]
- [rf_path];
-
- pwr_lmt = (idx_regulation == TXPWR_LMT_WW) ?
- phy_GetWorldWideLimit(limits) :
- hal_data->TxPwrLimit_5G[idx_regulation]
- [idx_bandwidth]
- [idx_rate_sctn]
- [idx_channel]
- [rf_path];
- }
- return pwr_lmt;
-}
+ for (i = 0; i < MAX_REGULATION_NUM; i++)
+ limits[i] = hal_data->TxPwrLimit_2_4G[i]
+ [idx_bandwidth]
+ [idx_rate_sctn]
+ [idx_channel]
+ [rf_path];
-static void phy_CrossReferenceHTAndVHTTxPowerLimit(struct adapter *padapter)
-{
- struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
- u8 regulation, bw, channel, rateSection;
- s8 tempPwrLmt = 0;
+ pwr_lmt = (idx_regulation == TXPWR_LMT_WW) ?
+ phy_GetWorldWideLimit(limits) :
+ hal_data->TxPwrLimit_2_4G[idx_regulation]
+ [idx_bandwidth]
+ [idx_rate_sctn]
+ [idx_channel]
+ [rf_path];
- for (regulation = 0; regulation < MAX_REGULATION_NUM; ++regulation) {
- for (bw = 0; bw < MAX_5G_BANDWIDTH_NUM; ++bw) {
- for (channel = 0; channel < CHANNEL_MAX_NUMBER_5G; ++channel) {
- for (rateSection = 0; rateSection < MAX_RATE_SECTION_NUM; ++rateSection) {
- tempPwrLmt = pHalData->TxPwrLimit_5G[regulation][bw][rateSection][channel][ODM_RF_PATH_A];
- if (tempPwrLmt == MAX_POWER_INDEX) {
- u8 baseSection = 2, refSection = 6;
- if (bw == 0 || bw == 1) { /* 5G 20M 40M VHT and HT can cross reference */
- /* 1, bw, rateSection, channel, ODM_RF_PATH_A); */
- if (rateSection >= 2 && rateSection <= 9) {
- if (rateSection == 2) {
- baseSection = 2;
- refSection = 6;
- } else if (rateSection == 3) {
- baseSection = 3;
- refSection = 7;
- } else if (rateSection == 4) {
- baseSection = 4;
- refSection = 8;
- } else if (rateSection == 5) {
- baseSection = 5;
- refSection = 9;
- } else if (rateSection == 6) {
- baseSection = 6;
- refSection = 2;
- } else if (rateSection == 7) {
- baseSection = 7;
- refSection = 3;
- } else if (rateSection == 8) {
- baseSection = 8;
- refSection = 4;
- } else if (rateSection == 9) {
- baseSection = 9;
- refSection = 5;
- }
- pHalData->TxPwrLimit_5G[regulation][bw][baseSection][channel][ODM_RF_PATH_A] =
- pHalData->TxPwrLimit_5G[regulation][bw][refSection][channel][ODM_RF_PATH_A];
- }
- }
- }
- }
- }
- }
- }
+ return pwr_lmt;
}
void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter)
@@ -1694,8 +1422,6 @@ void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter)
s8 tempValue = 0, tempPwrLmt = 0;
u8 rfPath = 0;
- phy_CrossReferenceHTAndVHTTxPowerLimit(Adapter);
-
for (regulation = 0; regulation < MAX_REGULATION_NUM; ++regulation) {
for (bw = 0; bw < MAX_2_4G_BANDWIDTH_NUM; ++bw) {
for (channel = 0; channel < CHANNEL_MAX_NUMBER_2G; ++channel) {
@@ -1705,17 +1431,17 @@ void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter)
for (rfPath = ODM_RF_PATH_A; rfPath < MAX_RF_PATH_NUM; ++rfPath) {
if (pHalData->odmpriv.PhyRegPgValueType == PHY_REG_PG_EXACT_VALUE) {
if (rateSection == 5) /* HT 4T */
- BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, BAND_ON_2_4G, rfPath, RF_4TX, HT_MCS24_MCS31);
+ BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, rfPath, RF_4TX, HT_MCS24_MCS31);
else if (rateSection == 4) /* HT 3T */
- BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, BAND_ON_2_4G, rfPath, RF_3TX, HT_MCS16_MCS23);
+ BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, rfPath, RF_3TX, HT_MCS16_MCS23);
else if (rateSection == 3) /* HT 2T */
- BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, BAND_ON_2_4G, rfPath, RF_2TX, HT_MCS8_MCS15);
+ BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, rfPath, RF_2TX, HT_MCS8_MCS15);
else if (rateSection == 2) /* HT 1T */
- BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, BAND_ON_2_4G, rfPath, RF_1TX, HT_MCS0_MCS7);
+ BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, rfPath, RF_1TX, HT_MCS0_MCS7);
else if (rateSection == 1) /* OFDM */
- BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, BAND_ON_2_4G, rfPath, RF_1TX, OFDM);
+ BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, rfPath, RF_1TX, OFDM);
else if (rateSection == 0) /* CCK */
- BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, BAND_ON_2_4G, rfPath, RF_1TX, CCK);
+ BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, rfPath, RF_1TX, CCK);
} else
BW40PwrBasedBm2_4G = Adapter->registrypriv.RegPowerBase * 2;
@@ -1742,20 +1468,11 @@ void PHY_InitTxPowerLimit(struct adapter *Adapter)
for (l = 0; l < MAX_RF_PATH_NUM; ++l)
pHalData->TxPwrLimit_2_4G[i][j][k][m][l] = MAX_POWER_INDEX;
}
-
- for (i = 0; i < MAX_REGULATION_NUM; ++i) {
- for (j = 0; j < MAX_5G_BANDWIDTH_NUM; ++j)
- for (k = 0; k < MAX_RATE_SECTION_NUM; ++k)
- for (m = 0; m < CHANNEL_MAX_NUMBER_5G; ++m)
- for (l = 0; l < MAX_RF_PATH_NUM; ++l)
- pHalData->TxPwrLimit_5G[i][j][k][m][l] = MAX_POWER_INDEX;
- }
}
void PHY_SetTxPowerLimit(
struct adapter *Adapter,
u8 *Regulation,
- u8 *Band,
u8 *Bandwidth,
u8 *RateSection,
u8 *RfPath,
@@ -1813,38 +1530,21 @@ void PHY_SetTxPowerLimit(
else if (eqNByte(Bandwidth, (u8 *)("160M"), 4))
bandwidth = 3;
- if (eqNByte(Band, (u8 *)("2.4G"), 4)) {
- channelIndex = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_2_4G, channel);
-
- if (channelIndex == -1)
- return;
-
- prevPowerLimit = pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channelIndex][ODM_RF_PATH_A];
-
- if (powerLimit < prevPowerLimit)
- pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channelIndex][ODM_RF_PATH_A] = powerLimit;
-
- } else if (eqNByte(Band, (u8 *)("5G"), 2)) {
- channelIndex = phy_GetChannelIndexOfTxPowerLimit(BAND_ON_5G, channel);
+ channelIndex = phy_GetChannelIndexOfTxPowerLimit(channel);
- if (channelIndex == -1)
- return;
-
- prevPowerLimit = pHalData->TxPwrLimit_5G[regulation][bandwidth][rateSection][channelIndex][ODM_RF_PATH_A];
+ if (channelIndex == -1)
+ return;
- if (powerLimit < prevPowerLimit)
- pHalData->TxPwrLimit_5G[regulation][bandwidth][rateSection][channelIndex][ODM_RF_PATH_A] = powerLimit;
+ prevPowerLimit = pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channelIndex][ODM_RF_PATH_A];
- } else {
- return;
- }
+ if (powerLimit < prevPowerLimit)
+ pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channelIndex][ODM_RF_PATH_A] = powerLimit;
}
void Hal_ChannelPlanToRegulation(struct adapter *Adapter, u16 ChannelPlan)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
pHalData->Regulation2_4G = TXPWR_LMT_WW;
- pHalData->Regulation5G = TXPWR_LMT_WW;
switch (ChannelPlan) {
case RT_CHANNEL_DOMAIN_WORLD_NULL:
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index bfe0c3a773af..0307ea383806 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -972,10 +972,6 @@ void ODM_CmnInfoHook(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, void
pDM_Odm->pwirelessmode = pValue;
break;
- case ODM_CMNINFO_BAND:
- pDM_Odm->pBandType = pValue;
- break;
-
case ODM_CMNINFO_SEC_CHNL_OFFSET:
pDM_Odm->pSecChOffset = pValue;
break;
@@ -1183,10 +1179,6 @@ void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value)
pDM_Odm->WirelessMode = (u8)Value;
break;
- case ODM_CMNINFO_BAND:
- pDM_Odm->BandType = (u8)Value;
- break;
-
case ODM_CMNINFO_SEC_CHNL_OFFSET:
pDM_Odm->SecChOffset = (u8)Value;
break;
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index a7a77fbb8390..788fc1c068b5 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -315,7 +315,6 @@ enum odm_cmninfo_e {
ODM_CMNINFO_TX_UNI,
ODM_CMNINFO_RX_UNI,
ODM_CMNINFO_WM_MODE, /* ODM_WIRELESS_MODE_E */
- ODM_CMNINFO_BAND, /* ODM_BAND_TYPE_E */
ODM_CMNINFO_SEC_CHNL_OFFSET, /* ODM_SEC_CHNL_OFFSET_E */
ODM_CMNINFO_SEC_MODE, /* ODM_SECURITY_E */
ODM_CMNINFO_BW, /* ODM_BW_E */
@@ -459,14 +458,6 @@ enum { /* tag_Wireless_Mode_Definition */
ODM_WM_AUTO = BIT5,
};
-/* ODM_CMNINFO_BAND */
-enum { /* tag_Band_Type_Definition */
- ODM_BAND_2_4G = 0,
- ODM_BAND_5G,
- ODM_BAND_ON_BOTH,
- ODM_BANDMAX
-};
-
/* ODM_CMNINFO_BW */
enum { /* tag_Bandwidth_Definition */
ODM_BW20M = 0,
@@ -788,8 +779,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */
u64 *pNumRxBytesUnicast;
/* Wireless mode B/G/A/N = BIT0/BIT1/BIT2/BIT3 */
u8 *pwirelessmode; /* ODM_WIRELESS_MODE_E */
- /* Frequence band 2.4G/5G = 0/1 */
- u8 *pBandType;
/* Secondary channel offset don't_care/below/above = 0/1/2 */
u8 *pSecChOffset;
/* Security mode Open/WEP/AES/TKIP = 0/1/2/3 */
diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
index b77c61598294..a29bd9375023 100644
--- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
+++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
@@ -117,7 +117,6 @@ void odm_ConfigBB_AGC_8723B(
void odm_ConfigBB_PHY_REG_PG_8723B(
struct dm_odm_t *pDM_Odm,
- u32 Band,
u32 RfPath,
u32 TxNum,
u32 Addr,
@@ -128,7 +127,7 @@ void odm_ConfigBB_PHY_REG_PG_8723B(
if (Addr == 0xfe || Addr == 0xffe)
msleep(50);
else {
- PHY_StoreTxPowerByRate(pDM_Odm->Adapter, Band, RfPath, TxNum, Addr, Bitmask, Data);
+ PHY_StoreTxPowerByRate(pDM_Odm->Adapter, RfPath, TxNum, Addr, Bitmask, Data);
}
}
@@ -162,7 +161,6 @@ void odm_ConfigBB_PHY_8723B(
void odm_ConfigBB_TXPWR_LMT_8723B(
struct dm_odm_t *pDM_Odm,
u8 *Regulation,
- u8 *Band,
u8 *Bandwidth,
u8 *RateSection,
u8 *RfPath,
@@ -173,7 +171,6 @@ void odm_ConfigBB_TXPWR_LMT_8723B(
PHY_SetTxPowerLimit(
pDM_Odm->Adapter,
Regulation,
- Band,
Bandwidth,
RateSection,
RfPath,
diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
index b392d14c389d..bdd6fde49fc6 100644
--- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
+++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
@@ -25,7 +25,6 @@ void odm_ConfigBB_AGC_8723B(struct dm_odm_t *pDM_Odm,
);
void odm_ConfigBB_PHY_REG_PG_8723B(struct dm_odm_t *pDM_Odm,
- u32 Band,
u32 RfPath,
u32 TxNum,
u32 Addr,
@@ -41,7 +40,6 @@ void odm_ConfigBB_PHY_8723B(struct dm_odm_t *pDM_Odm,
void odm_ConfigBB_TXPWR_LMT_8723B(struct dm_odm_t *pDM_Odm,
u8 *Regulation,
- u8 *Band,
u8 *Bandwidth,
u8 *RateSection,
u8 *RfPath,
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
index 23be025ceb5b..5840a5241fde 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
@@ -109,7 +109,6 @@ static void Update_ODM_ComInfo_8723b(struct adapter *Adapter)
ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_CHNL, &(pHalData->CurrentChannel));
ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_NET_CLOSED, &(Adapter->net_closed));
ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_MP_MODE, &zero);
- ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_BAND, &(pHalData->CurrentBandType));
ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_FORCED_IGI_LB, &(pHalData->u1ForcedIgiLb));
ODM_CmnInfoHook(pDM_Odm, ODM_CMNINFO_FORCED_RATE, &(pHalData->ForcedDataRate));
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 23435dcc5537..6e524034f388 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -546,15 +546,13 @@ u8 PHY_GetTxPowerIndex(
{
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
s8 txPower = 0, powerDiffByRate = 0, limit = 0;
- bool bIn24G = false;
- txPower = (s8) PHY_GetTxPowerIndexBase(padapter, RFPath, Rate, BandWidth, Channel, &bIn24G);
- powerDiffByRate = PHY_GetTxPowerByRate(padapter, BAND_ON_2_4G, ODM_RF_PATH_A, RF_1TX, Rate);
+ txPower = (s8) PHY_GetTxPowerIndexBase(padapter, RFPath, Rate, BandWidth, Channel);
+ powerDiffByRate = PHY_GetTxPowerByRate(padapter, ODM_RF_PATH_A, RF_1TX, Rate);
limit = phy_get_tx_pwr_lmt(
padapter,
padapter->registrypriv.RegPwrTblSel,
- (u8)(!bIn24G),
pHalData->CurrentChannelBW,
RFPath,
Rate,
diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
index 73f6cadb5c79..a30e1e09826d 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
@@ -73,7 +73,6 @@ struct bb_register_def {
u8
PHY_GetTxPowerByRateBase(
struct adapter *Adapter,
-u8 Band,
u8 RfPath,
u8 TxNum,
enum rate_section RateSection
@@ -113,7 +112,6 @@ u8 RateSection
s8
PHY_GetTxPowerByRate(
struct adapter *padapter,
-u8 Band,
u8 RFPath,
u8 TxNum,
u8 RateIndex
@@ -122,7 +120,6 @@ u8 RateIndex
void
PHY_SetTxPowerByRate(
struct adapter *padapter,
-u8 Band,
u8 RFPath,
u8 TxNum,
u8 Rate,
@@ -154,7 +151,6 @@ struct adapter *padapter
void
PHY_StoreTxPowerByRate(
struct adapter *padapter,
-u32 Band,
u32 RfPath,
u32 TxNum,
u32 RegAddr,
@@ -173,12 +169,11 @@ struct adapter *padapter,
u8 RFPath,
u8 Rate,
enum channel_width BandWidth,
-u8 Channel,
- bool *bIn24G
+u8 Channel
);
s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 RegPwrTblSel,
- enum band_type Band, enum channel_width Bandwidth,
+ enum channel_width Bandwidth,
u8 RfPath,
u8 DataRate,
u8 Channel
@@ -188,7 +183,6 @@ void
PHY_SetTxPowerLimit(
struct adapter *Adapter,
u8 *Regulation,
-u8 *Band,
u8 *Bandwidth,
u8 *RateSection,
u8 *RfPath,
diff --git a/drivers/staging/rtl8723bs/include/hal_data.h b/drivers/staging/rtl8723bs/include/hal_data.h
index babcb03a7c23..78246356927b 100644
--- a/drivers/staging/rtl8723bs/include/hal_data.h
+++ b/drivers/staging/rtl8723bs/include/hal_data.h
@@ -59,8 +59,6 @@ enum rt_ampdu_burst {
#define MAX_5G_BANDWIDTH_NUM 4
#define MAX_BASE_NUM_IN_PHY_REG_PG_2_4G 10 /* CCK:1, OFDM:1, HT:4, VHT:4 */
-#define MAX_BASE_NUM_IN_PHY_REG_PG_5G 9 /* OFDM:1, HT:4, VHT:4 */
-
/* duplicate code, will move to ODM ######### */
/* define IQK_MAC_REG_NUM 4 */
@@ -182,8 +180,6 @@ struct hal_com_data {
/* current WIFI_PHY values */
enum wireless_mode CurrentWirelessMode;
enum channel_width CurrentChannelBW;
- enum band_type CurrentBandType; /* 0:2.4G, 1:5G */
- enum band_type BandSet;
u8 CurrentChannel;
u8 CurrentCenterFrequencyIndex1;
u8 nCur40MhzPrimeSC;/* Control channel sub-carrier */
@@ -236,13 +232,6 @@ struct hal_com_data {
s8 OFDM_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW20_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW40_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
- /* 3 [5G] */
- u8 Index5G_BW40_Base[MAX_RF_PATH][CHANNEL_MAX_NUMBER];
- u8 Index5G_BW80_Base[MAX_RF_PATH][CHANNEL_MAX_NUMBER_5G_80M];
- s8 OFDM_5G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
- s8 BW20_5G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
- s8 BW40_5G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
- s8 BW80_5G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
u8 Regulation2_4G;
u8 Regulation5G;
@@ -253,15 +242,13 @@ struct hal_com_data {
/* TX power by rate table at most 4RF path. */
/* The register is */
/* VHT TX power by rate off setArray = */
- /* Band:-2G&5G = 0 / 1 */
/* RF: at most 4*4 = ABCD = 0/1/2/3 */
/* CCK = 0 OFDM = 1/2 HT-MCS 0-15 =3/4/56 VHT =7/8/9/10/11 */
u8 TxPwrByRateTable;
u8 TxPwrByRateBand;
- s8 TxPwrByRateOffset[TX_PWR_BY_RATE_NUM_BAND]
- [TX_PWR_BY_RATE_NUM_RF]
- [TX_PWR_BY_RATE_NUM_RF]
- [TX_PWR_BY_RATE_NUM_RATE];
+ s8 TxPwrByRateOffset[TX_PWR_BY_RATE_NUM_RF]
+ [TX_PWR_BY_RATE_NUM_RF]
+ [TX_PWR_BY_RATE_NUM_RATE];
/* */
/* 2 Power Limit Table */
@@ -278,21 +265,10 @@ struct hal_com_data {
[CHANNEL_MAX_NUMBER_2G]
[MAX_RF_PATH_NUM];
- /* Power Limit Table for 5G */
- s8 TxPwrLimit_5G[MAX_REGULATION_NUM]
- [MAX_5G_BANDWIDTH_NUM]
- [MAX_RATE_SECTION_NUM]
- [CHANNEL_MAX_NUMBER_5G]
- [MAX_RF_PATH_NUM];
-
-
/* Store the original power by rate value of the base of each rate section of rf path A & B */
u8 TxPwrByRateBase2_4G[TX_PWR_BY_RATE_NUM_RF]
[TX_PWR_BY_RATE_NUM_RF]
[MAX_BASE_NUM_IN_PHY_REG_PG_2_4G];
- u8 TxPwrByRateBase5G[TX_PWR_BY_RATE_NUM_RF]
- [TX_PWR_BY_RATE_NUM_RF]
- [MAX_BASE_NUM_IN_PHY_REG_PG_5G];
/* For power group */
u8 PwrGroupHT20[RF_PATH_MAX_92C_88E][CHANNEL_MAX_NUMBER];
@@ -319,13 +295,9 @@ struct hal_com_data {
u32 AntennaRxPath; /* Antenna path Rx */
u8 PAType_2G;
- u8 PAType_5G;
u8 LNAType_2G;
- u8 LNAType_5G;
u8 ExternalPA_2G;
u8 ExternalLNA_2G;
- u8 ExternalPA_5G;
- u8 ExternalLNA_5G;
u8 TypeGLNA;
u8 TypeGPA;
u8 TypeALNA;
diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h
index 6417d1b758d2..861aa71cd179 100644
--- a/drivers/staging/rtl8723bs/include/hal_phy.h
+++ b/drivers/staging/rtl8723bs/include/hal_phy.h
@@ -17,13 +17,6 @@
/*--------------------------Define Parameters-------------------------------*/
-enum band_type {
- BAND_ON_2_4G = 0,
- BAND_ON_5G,
- BAND_ON_BOTH,
- BANDMAX
-};
-
enum {
RF_TYPE_MIN = 0, /* 0 */
RF_8225 = 1, /* 1 11b/g RF for verification only */
--
2.20.1
remove 5Ghz code related to channel plan definition.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 214 ++++++++----------
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 34 ---
drivers/staging/rtl8723bs/include/hal_data.h | 6 +-
.../staging/rtl8723bs/include/rtw_mlme_ext.h | 47 +---
.../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 -
.../staging/rtl8723bs/os_dep/ioctl_linux.c | 1 -
6 files changed, 97 insertions(+), 207 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index cf0079a0c179..285acd3d843b 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -81,93 +81,93 @@ static struct rt_channel_plan_2g RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
/* 0x00 ~ 0x1F , Old Define ===== */
- {0x02, 0x20}, /* 0x00, RT_CHANNEL_DOMAIN_FCC */
- {0x02, 0x0A}, /* 0x01, RT_CHANNEL_DOMAIN_IC */
- {0x01, 0x01}, /* 0x02, RT_CHANNEL_DOMAIN_ETSI */
- {0x01, 0x00}, /* 0x03, RT_CHANNEL_DOMAIN_SPAIN */
- {0x01, 0x00}, /* 0x04, RT_CHANNEL_DOMAIN_FRANCE */
- {0x03, 0x00}, /* 0x05, RT_CHANNEL_DOMAIN_MKK */
- {0x03, 0x00}, /* 0x06, RT_CHANNEL_DOMAIN_MKK1 */
- {0x01, 0x09}, /* 0x07, RT_CHANNEL_DOMAIN_ISRAEL */
- {0x03, 0x09}, /* 0x08, RT_CHANNEL_DOMAIN_TELEC */
- {0x03, 0x00}, /* 0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN */
- {0x00, 0x00}, /* 0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 */
- {0x02, 0x0F}, /* 0x0B, RT_CHANNEL_DOMAIN_TAIWAN */
- {0x01, 0x08}, /* 0x0C, RT_CHANNEL_DOMAIN_CHINA */
- {0x02, 0x06}, /* 0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO */
- {0x02, 0x0B}, /* 0x0E, RT_CHANNEL_DOMAIN_KOREA */
- {0x02, 0x09}, /* 0x0F, RT_CHANNEL_DOMAIN_TURKEY */
- {0x01, 0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */
- {0x02, 0x05}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */
- {0x01, 0x21}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
- {0x00, 0x04}, /* 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G */
- {0x02, 0x10}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */
- {0x00, 0x21}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */
- {0x00, 0x22}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */
- {0x03, 0x21}, /* 0x17, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
- {0x06, 0x08}, /* 0x18, RT_CHANNEL_DOMAIN_PAKISTAN_NO_DFS */
- {0x02, 0x08}, /* 0x19, RT_CHANNEL_DOMAIN_TAIWAN2_NO_DFS */
- {0x00, 0x00}, /* 0x1A, */
- {0x00, 0x00}, /* 0x1B, */
- {0x00, 0x00}, /* 0x1C, */
- {0x00, 0x00}, /* 0x1D, */
- {0x00, 0x00}, /* 0x1E, */
- {0x06, 0x04}, /* 0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G */
+ {0x02}, /* 0x00, RT_CHANNEL_DOMAIN_FCC */
+ {0x02}, /* 0x01, RT_CHANNEL_DOMAIN_IC */
+ {0x01}, /* 0x02, RT_CHANNEL_DOMAIN_ETSI */
+ {0x01}, /* 0x03, RT_CHANNEL_DOMAIN_SPAIN */
+ {0x01}, /* 0x04, RT_CHANNEL_DOMAIN_FRANCE */
+ {0x03}, /* 0x05, RT_CHANNEL_DOMAIN_MKK */
+ {0x03}, /* 0x06, RT_CHANNEL_DOMAIN_MKK1 */
+ {0x01}, /* 0x07, RT_CHANNEL_DOMAIN_ISRAEL */
+ {0x03}, /* 0x08, RT_CHANNEL_DOMAIN_TELEC */
+ {0x03}, /* 0x09, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN */
+ {0x00}, /* 0x0A, RT_CHANNEL_DOMAIN_WORLD_WIDE_13 */
+ {0x02}, /* 0x0B, RT_CHANNEL_DOMAIN_TAIWAN */
+ {0x01}, /* 0x0C, RT_CHANNEL_DOMAIN_CHINA */
+ {0x02}, /* 0x0D, RT_CHANNEL_DOMAIN_SINGAPORE_INDIA_MEXICO */
+ {0x02}, /* 0x0E, RT_CHANNEL_DOMAIN_KOREA */
+ {0x02}, /* 0x0F, RT_CHANNEL_DOMAIN_TURKEY */
+ {0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */
+ {0x02}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */
+ {0x01}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
+ {0x00}, /* 0x13, RT_CHANNEL_DOMAIN_WORLD_WIDE_5G */
+ {0x02}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */
+ {0x00}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */
+ {0x00}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */
+ {0x03}, /* 0x17, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
+ {0x06}, /* 0x18, RT_CHANNEL_DOMAIN_PAKISTAN_NO_DFS */
+ {0x02}, /* 0x19, RT_CHANNEL_DOMAIN_TAIWAN2_NO_DFS */
+ {0x00}, /* 0x1A, */
+ {0x00}, /* 0x1B, */
+ {0x00}, /* 0x1C, */
+ {0x00}, /* 0x1D, */
+ {0x00}, /* 0x1E, */
+ {0x06}, /* 0x1F, RT_CHANNEL_DOMAIN_WORLD_WIDE_ONLY_5G */
/* 0x20 ~ 0x7F , New Define ===== */
- {0x00, 0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */
- {0x01, 0x00}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */
- {0x02, 0x00}, /* 0x22, RT_CHANNEL_DOMAIN_FCC1_NULL */
- {0x03, 0x00}, /* 0x23, RT_CHANNEL_DOMAIN_MKK1_NULL */
- {0x04, 0x00}, /* 0x24, RT_CHANNEL_DOMAIN_ETSI2_NULL */
- {0x02, 0x04}, /* 0x25, RT_CHANNEL_DOMAIN_FCC1_FCC1 */
- {0x00, 0x01}, /* 0x26, RT_CHANNEL_DOMAIN_WORLD_ETSI1 */
- {0x03, 0x0C}, /* 0x27, RT_CHANNEL_DOMAIN_MKK1_MKK1 */
- {0x00, 0x0B}, /* 0x28, RT_CHANNEL_DOMAIN_WORLD_KCC1 */
- {0x00, 0x05}, /* 0x29, RT_CHANNEL_DOMAIN_WORLD_FCC2 */
- {0x00, 0x00}, /* 0x2A, */
- {0x00, 0x00}, /* 0x2B, */
- {0x00, 0x00}, /* 0x2C, */
- {0x00, 0x00}, /* 0x2D, */
- {0x00, 0x00}, /* 0x2E, */
- {0x00, 0x00}, /* 0x2F, */
- {0x00, 0x06}, /* 0x30, RT_CHANNEL_DOMAIN_WORLD_FCC3 */
- {0x00, 0x07}, /* 0x31, RT_CHANNEL_DOMAIN_WORLD_FCC4 */
- {0x00, 0x08}, /* 0x32, RT_CHANNEL_DOMAIN_WORLD_FCC5 */
- {0x00, 0x09}, /* 0x33, RT_CHANNEL_DOMAIN_WORLD_FCC6 */
- {0x02, 0x0A}, /* 0x34, RT_CHANNEL_DOMAIN_FCC1_FCC7 */
- {0x00, 0x02}, /* 0x35, RT_CHANNEL_DOMAIN_WORLD_ETSI2 */
- {0x00, 0x03}, /* 0x36, RT_CHANNEL_DOMAIN_WORLD_ETSI3 */
- {0x03, 0x0D}, /* 0x37, RT_CHANNEL_DOMAIN_MKK1_MKK2 */
- {0x03, 0x0E}, /* 0x38, RT_CHANNEL_DOMAIN_MKK1_MKK3 */
- {0x02, 0x0F}, /* 0x39, RT_CHANNEL_DOMAIN_FCC1_NCC1 */
- {0x00, 0x00}, /* 0x3A, */
- {0x00, 0x00}, /* 0x3B, */
- {0x00, 0x00}, /* 0x3C, */
- {0x00, 0x00}, /* 0x3D, */
- {0x00, 0x00}, /* 0x3E, */
- {0x00, 0x00}, /* 0x3F, */
- {0x02, 0x10}, /* 0x40, RT_CHANNEL_DOMAIN_FCC1_NCC2 */
- {0x05, 0x00}, /* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_NULL */
- {0x01, 0x12}, /* 0x42, RT_CHANNEL_DOMAIN_ETSI1_ETSI4 */
- {0x02, 0x05}, /* 0x43, RT_CHANNEL_DOMAIN_FCC1_FCC2 */
- {0x02, 0x11}, /* 0x44, RT_CHANNEL_DOMAIN_FCC1_NCC3 */
- {0x00, 0x13}, /* 0x45, RT_CHANNEL_DOMAIN_WORLD_ETSI5 */
- {0x02, 0x14}, /* 0x46, RT_CHANNEL_DOMAIN_FCC1_FCC8 */
- {0x00, 0x15}, /* 0x47, RT_CHANNEL_DOMAIN_WORLD_ETSI6 */
- {0x00, 0x16}, /* 0x48, RT_CHANNEL_DOMAIN_WORLD_ETSI7 */
- {0x00, 0x17}, /* 0x49, RT_CHANNEL_DOMAIN_WORLD_ETSI8 */
- {0x00, 0x18}, /* 0x50, RT_CHANNEL_DOMAIN_WORLD_ETSI9 */
- {0x00, 0x19}, /* 0x51, RT_CHANNEL_DOMAIN_WORLD_ETSI10 */
- {0x00, 0x1A}, /* 0x52, RT_CHANNEL_DOMAIN_WORLD_ETSI11 */
- {0x02, 0x1B}, /* 0x53, RT_CHANNEL_DOMAIN_FCC1_NCC4 */
- {0x00, 0x1C}, /* 0x54, RT_CHANNEL_DOMAIN_WORLD_ETSI12 */
- {0x02, 0x1D}, /* 0x55, RT_CHANNEL_DOMAIN_FCC1_FCC9 */
- {0x00, 0x1E}, /* 0x56, RT_CHANNEL_DOMAIN_WORLD_ETSI13 */
- {0x02, 0x1F}, /* 0x57, RT_CHANNEL_DOMAIN_FCC1_FCC10 */
+ {0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */
+ {0x01}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */
+ {0x02}, /* 0x22, RT_CHANNEL_DOMAIN_FCC1_NULL */
+ {0x03}, /* 0x23, RT_CHANNEL_DOMAIN_MKK1_NULL */
+ {0x04}, /* 0x24, RT_CHANNEL_DOMAIN_ETSI2_NULL */
+ {0x02}, /* 0x25, RT_CHANNEL_DOMAIN_FCC1_FCC1 */
+ {0x00}, /* 0x26, RT_CHANNEL_DOMAIN_WORLD_ETSI1 */
+ {0x03}, /* 0x27, RT_CHANNEL_DOMAIN_MKK1_MKK1 */
+ {0x00}, /* 0x28, RT_CHANNEL_DOMAIN_WORLD_KCC1 */
+ {0x00}, /* 0x29, RT_CHANNEL_DOMAIN_WORLD_FCC2 */
+ {0x00}, /* 0x2A, */
+ {0x00}, /* 0x2B, */
+ {0x00}, /* 0x2C, */
+ {0x00}, /* 0x2D, */
+ {0x00}, /* 0x2E, */
+ {0x00}, /* 0x2F, */
+ {0x00}, /* 0x30, RT_CHANNEL_DOMAIN_WORLD_FCC3 */
+ {0x00}, /* 0x31, RT_CHANNEL_DOMAIN_WORLD_FCC4 */
+ {0x00}, /* 0x32, RT_CHANNEL_DOMAIN_WORLD_FCC5 */
+ {0x00}, /* 0x33, RT_CHANNEL_DOMAIN_WORLD_FCC6 */
+ {0x02}, /* 0x34, RT_CHANNEL_DOMAIN_FCC1_FCC7 */
+ {0x00}, /* 0x35, RT_CHANNEL_DOMAIN_WORLD_ETSI2 */
+ {0x00}, /* 0x36, RT_CHANNEL_DOMAIN_WORLD_ETSI3 */
+ {0x03}, /* 0x37, RT_CHANNEL_DOMAIN_MKK1_MKK2 */
+ {0x03}, /* 0x38, RT_CHANNEL_DOMAIN_MKK1_MKK3 */
+ {0x02}, /* 0x39, RT_CHANNEL_DOMAIN_FCC1_NCC1 */
+ {0x00}, /* 0x3A, */
+ {0x00}, /* 0x3B, */
+ {0x00}, /* 0x3C, */
+ {0x00}, /* 0x3D, */
+ {0x00}, /* 0x3E, */
+ {0x00}, /* 0x3F, */
+ {0x02}, /* 0x40, RT_CHANNEL_DOMAIN_FCC1_NCC2 */
+ {0x05}, /* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_NULL */
+ {0x01}, /* 0x42, RT_CHANNEL_DOMAIN_ETSI1_ETSI4 */
+ {0x02}, /* 0x43, RT_CHANNEL_DOMAIN_FCC1_FCC2 */
+ {0x02}, /* 0x44, RT_CHANNEL_DOMAIN_FCC1_NCC3 */
+ {0x00}, /* 0x45, RT_CHANNEL_DOMAIN_WORLD_ETSI5 */
+ {0x02}, /* 0x46, RT_CHANNEL_DOMAIN_FCC1_FCC8 */
+ {0x00}, /* 0x47, RT_CHANNEL_DOMAIN_WORLD_ETSI6 */
+ {0x00}, /* 0x48, RT_CHANNEL_DOMAIN_WORLD_ETSI7 */
+ {0x00}, /* 0x49, RT_CHANNEL_DOMAIN_WORLD_ETSI8 */
+ {0x00}, /* 0x50, RT_CHANNEL_DOMAIN_WORLD_ETSI9 */
+ {0x00}, /* 0x51, RT_CHANNEL_DOMAIN_WORLD_ETSI10 */
+ {0x00}, /* 0x52, RT_CHANNEL_DOMAIN_WORLD_ETSI11 */
+ {0x02}, /* 0x53, RT_CHANNEL_DOMAIN_FCC1_NCC4 */
+ {0x00}, /* 0x54, RT_CHANNEL_DOMAIN_WORLD_ETSI12 */
+ {0x02}, /* 0x55, RT_CHANNEL_DOMAIN_FCC1_FCC9 */
+ {0x00}, /* 0x56, RT_CHANNEL_DOMAIN_WORLD_ETSI13 */
+ {0x02}, /* 0x57, RT_CHANNEL_DOMAIN_FCC1_FCC10 */
};
/* use the combination for max channel numbers */
-static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02};
+static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03};
/* Search the @param ch in given @param ch_set
* @ch_set: the given channel set
@@ -189,23 +189,6 @@ int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch)
return i;
}
-/* Check the @param ch is fit with setband setting of @param adapter
- * @adapter: the given adapter
- * @ch: the given channel number
- *
- * return true when check valid, false not valid
- */
-bool rtw_mlme_band_check(struct adapter *adapter, const u32 ch)
-{
- if (adapter->setband == GHZ24_50 /* 2.4G and 5G */
- || (adapter->setband == GHZ_24 && ch < 35) /* 2.4G only */
- || (adapter->setband == GHZ_50 && ch > 35) /* 5G only */
- ) {
- return true;
- }
- return false;
-}
-
/****************************************************************************
Following are the initialization functions for WiFi MLME
@@ -380,7 +363,6 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
else if ((channel_set[chanset_size].ChannelNum >= 12 && channel_set[chanset_size].ChannelNum <= 14))
channel_set[chanset_size].ScanType = SCAN_PASSIVE;
} else if (RT_CHANNEL_DOMAIN_WORLD_WIDE_13 == ChannelPlan ||
- RT_CHANNEL_DOMAIN_WORLD_WIDE_5G == ChannelPlan ||
RT_CHANNEL_DOMAIN_2G_WORLD == Index2G) { /* channel 12~13, passive scan */
if (channel_set[chanset_size].ChannelNum <= 11)
channel_set[chanset_size].ScanType = SCAN_ACTIVE;
@@ -4434,10 +4416,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].ChannelNum != 0)) {
if (chplan_new[i].ChannelNum == channel) {
if (chplan_new[i].ScanType == SCAN_PASSIVE) {
- /* 5G Bnad 2, 3 (DFS) doesn't change to active scan */
- if (channel >= 52 && channel <= 144)
- break;
-
chplan_new[i].ScanType = SCAN_ACTIVE;
}
break;
@@ -5557,7 +5535,6 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
set_idx = rtw_ch_set_search_ch(pmlmeext->channel_set, in[i].hw_value);
if (in[i].hw_value && !(in[i].flags & RTW_IEEE80211_CHAN_DISABLED)
&& set_idx >= 0
- && rtw_mlme_band_check(padapter, in[i].hw_value)
) {
if (j >= out_num) {
netdev_dbg(padapter->pnetdev,
@@ -5581,23 +5558,20 @@ static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_c
if (j == 0) {
for (i = 0; i < pmlmeext->max_chan_nums; i++) {
- if (rtw_mlme_band_check(padapter, pmlmeext->channel_set[i].ChannelNum)) {
-
- if (j >= out_num) {
- netdev_dbg(padapter->pnetdev,
- FUNC_ADPT_FMT " out_num:%u not enough\n",
- FUNC_ADPT_ARG(padapter),
- out_num);
- break;
- }
+ if (j >= out_num) {
+ netdev_dbg(padapter->pnetdev,
+ FUNC_ADPT_FMT " out_num:%u not enough\n",
+ FUNC_ADPT_ARG(padapter),
+ out_num);
+ break;
+ }
- out[j].hw_value = pmlmeext->channel_set[i].ChannelNum;
+ out[j].hw_value = pmlmeext->channel_set[i].ChannelNum;
- if (pmlmeext->channel_set[i].ScanType == SCAN_PASSIVE)
- out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN;
+ if (pmlmeext->channel_set[i].ScanType == SCAN_PASSIVE)
+ out[j].flags |= RTW_IEEE80211_CHAN_PASSIVE_SCAN;
- j++;
- }
+ j++;
}
}
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 732659a2d844..395eb3b5af71 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -1564,139 +1564,105 @@ void Hal_ChannelPlanToRegulation(struct adapter *Adapter, u16 ChannelPlan)
break;
case RT_CHANNEL_DOMAIN_FCC1_FCC1:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI1:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_MKK1_MKK1:
pHalData->Regulation2_4G = TXPWR_LMT_MKK;
- pHalData->Regulation5G = TXPWR_LMT_MKK;
break;
case RT_CHANNEL_DOMAIN_WORLD_KCC1:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_MKK;
break;
case RT_CHANNEL_DOMAIN_WORLD_FCC2:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_FCC3:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_FCC4:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_FCC5:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_FCC6:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_FCC1_FCC7:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI2:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI3:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_MKK1_MKK2:
pHalData->Regulation2_4G = TXPWR_LMT_MKK;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_MKK1_MKK3:
pHalData->Regulation2_4G = TXPWR_LMT_MKK;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_FCC1_NCC1:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_FCC1_NCC2:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_GLOBAL_NULL:
pHalData->Regulation2_4G = TXPWR_LMT_WW;
- pHalData->Regulation5G = TXPWR_LMT_WW;
break;
case RT_CHANNEL_DOMAIN_ETSI1_ETSI4:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_FCC1_FCC2:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_FCC1_NCC3:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI5:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_FCC1_FCC8:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI6:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI7:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI8:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI9:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI10:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI11:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_FCC1_NCC4:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI12:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_FCC1_FCC9:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_WORLD_ETSI13:
pHalData->Regulation2_4G = TXPWR_LMT_ETSI;
- pHalData->Regulation5G = TXPWR_LMT_ETSI;
break;
case RT_CHANNEL_DOMAIN_FCC1_FCC10:
pHalData->Regulation2_4G = TXPWR_LMT_FCC;
- pHalData->Regulation5G = TXPWR_LMT_FCC;
break;
case RT_CHANNEL_DOMAIN_REALTEK_DEFINE: /* Realtek Reserve */
pHalData->Regulation2_4G = TXPWR_LMT_WW;
- pHalData->Regulation5G = TXPWR_LMT_WW;
break;
default:
break;
diff --git a/drivers/staging/rtl8723bs/include/hal_data.h b/drivers/staging/rtl8723bs/include/hal_data.h
index 78246356927b..3298fa8eb682 100644
--- a/drivers/staging/rtl8723bs/include/hal_data.h
+++ b/drivers/staging/rtl8723bs/include/hal_data.h
@@ -46,17 +46,14 @@ enum rt_ampdu_burst {
RT_AMPDU_BURST_8723B = 7,
};
-#define CHANNEL_MAX_NUMBER (14 + 24 + 21) /* 14 is the max channel number */
+#define CHANNEL_MAX_NUMBER (14) /* 14 is the max channel number */
#define CHANNEL_MAX_NUMBER_2G 14
-#define CHANNEL_MAX_NUMBER_5G 54 /* Please refer to "phy_GetChnlGroup8812A" and "Hal_ReadTxPowerInfo8812A" */
-#define CHANNEL_MAX_NUMBER_5G_80M 7
#define MAX_PG_GROUP 13
/* Tx Power Limit Table Size */
#define MAX_REGULATION_NUM 4
#define MAX_2_4G_BANDWIDTH_NUM 4
#define MAX_RATE_SECTION_NUM 10
-#define MAX_5G_BANDWIDTH_NUM 4
#define MAX_BASE_NUM_IN_PHY_REG_PG_2_4G 10 /* CCK:1, OFDM:1, HT:4, VHT:4 */
@@ -234,7 +231,6 @@ struct hal_com_data {
s8 BW40_24G_Diff[MAX_RF_PATH][MAX_TX_COUNT];
u8 Regulation2_4G;
- u8 Regulation5G;
u8 TxPwrInPercentage;
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index 7d655f02d383..89b389d4c44b 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -195,47 +195,6 @@ enum {
RT_CHANNEL_DOMAIN_2G_MAX,
};
-enum {
- RT_CHANNEL_DOMAIN_5G_NULL = 0x00,
- RT_CHANNEL_DOMAIN_5G_ETSI1 = 0x01, /* Europe */
- RT_CHANNEL_DOMAIN_5G_ETSI2 = 0x02, /* Australia, New Zealand */
- RT_CHANNEL_DOMAIN_5G_ETSI3 = 0x03, /* Russia */
- RT_CHANNEL_DOMAIN_5G_FCC1 = 0x04, /* US */
- RT_CHANNEL_DOMAIN_5G_FCC2 = 0x05, /* FCC o/w DFS Channels */
- RT_CHANNEL_DOMAIN_5G_FCC3 = 0x06, /* India, Mexico */
- RT_CHANNEL_DOMAIN_5G_FCC4 = 0x07, /* Venezuela */
- RT_CHANNEL_DOMAIN_5G_FCC5 = 0x08, /* China */
- RT_CHANNEL_DOMAIN_5G_FCC6 = 0x09, /* Israel */
- RT_CHANNEL_DOMAIN_5G_FCC7_IC1 = 0x0A, /* US, Canada */
- RT_CHANNEL_DOMAIN_5G_KCC1 = 0x0B, /* Korea */
- RT_CHANNEL_DOMAIN_5G_MKK1 = 0x0C, /* Japan */
- RT_CHANNEL_DOMAIN_5G_MKK2 = 0x0D, /* Japan (W52, W53) */
- RT_CHANNEL_DOMAIN_5G_MKK3 = 0x0E, /* Japan (W56) */
- RT_CHANNEL_DOMAIN_5G_NCC1 = 0x0F, /* Taiwan */
- RT_CHANNEL_DOMAIN_5G_NCC2 = 0x10, /* Taiwan o/w DFS */
- RT_CHANNEL_DOMAIN_5G_NCC3 = 0x11, /* Taiwan w/o DFS, Band4 only */
- RT_CHANNEL_DOMAIN_5G_ETSI4 = 0x12, /* Europe w/o DFS, Band1 only */
- RT_CHANNEL_DOMAIN_5G_ETSI5 = 0x13, /* Australia, New Zealand(w/o Weather radar) */
- RT_CHANNEL_DOMAIN_5G_FCC8 = 0x14, /* Latin America */
- RT_CHANNEL_DOMAIN_5G_ETSI6 = 0x15, /* Israel, Bahrain, Egypt, India, China, Malaysia */
- RT_CHANNEL_DOMAIN_5G_ETSI7 = 0x16, /* China */
- RT_CHANNEL_DOMAIN_5G_ETSI8 = 0x17, /* Jordan */
- RT_CHANNEL_DOMAIN_5G_ETSI9 = 0x18, /* Lebanon */
- RT_CHANNEL_DOMAIN_5G_ETSI10 = 0x19, /* Qatar */
- RT_CHANNEL_DOMAIN_5G_ETSI11 = 0x1A, /* Russia */
- RT_CHANNEL_DOMAIN_5G_NCC4 = 0x1B, /* Taiwan, (w/o Weather radar) */
- RT_CHANNEL_DOMAIN_5G_ETSI12 = 0x1C, /* Indonesia */
- RT_CHANNEL_DOMAIN_5G_FCC9 = 0x1D, /* w/o Weather radar) */
- RT_CHANNEL_DOMAIN_5G_ETSI13 = 0x1E, /* w/o Weather radar) */
- RT_CHANNEL_DOMAIN_5G_FCC10 = 0x1F, /* Argentina (w/o Weather radar) */
- /* Add new channel plan above this line =============== */
- /* Driver Self Defined ===== */
- RT_CHANNEL_DOMAIN_5G_FCC = 0x20,
- RT_CHANNEL_DOMAIN_5G_JAPAN_NO_DFS = 0x21,
- RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS = 0x22,
- RT_CHANNEL_DOMAIN_5G_MAX,
-};
-
#define rtw_is_channel_plan_valid(chplan) (chplan < RT_CHANNEL_DOMAIN_MAX || chplan == RT_CHANNEL_DOMAIN_REALTEK_DEFINE)
struct rt_channel_plan {
@@ -250,7 +209,6 @@ struct rt_channel_plan_2g {
struct rt_channel_plan_map {
unsigned char Index2G;
- unsigned char Index5G;
};
enum {
@@ -343,13 +301,13 @@ struct FW_Sta_Info {
* When the driver scanned RTW_SCAN_NUM_OF_CH channels, it would switch back to AP's operating channel for
* RTW_STAY_AP_CH_MILLISECOND * SURVEY_TO milliseconds.
* Example:
- * For chip supports 2.4G + 5GHz and AP mode is operating in channel 1,
+ * For chip supports 2.4G and AP mode is operating in channel 1,
* RTW_SCAN_NUM_OF_CH is 8, RTW_STAY_AP_CH_MILLISECOND is 3 and SURVEY_TO is 100.
* When it's STA mode gets set_scan command,
* it would
* 1. Doing the scan on channel 1.2.3.4.5.6.7.8
* 2. Back to channel 1 for 300 milliseconds
- * 3. Go through doing site survey on channel 9.10.11.36.40.44.48.52
+ * 3. Go through doing site survey on channel 9.10.11
* 4. Back to channel 1 for 300 milliseconds
* 5. ... and so on, till survey done.
*/
@@ -406,7 +364,6 @@ struct rt_channel_info {
};
int rtw_ch_set_search_ch(struct rt_channel_info *ch_set, const u32 ch);
-bool rtw_mlme_band_check(struct adapter *adapter, const u32 ch);
/* P2P_MAX_REG_CLASSES - Maximum number of regulatory classes */
#define P2P_MAX_REG_CLASSES 10
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index cc5bb534fee6..8514cfb3d7e0 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -77,7 +77,6 @@ static struct ieee80211_rate rtw_rates[] = {
#define RTW_G_RATES_NUM 12
#define RTW_2G_CHANNELS_NUM 14
-#define RTW_5G_CHANNELS_NUM 37
static struct ieee80211_channel rtw_2ghz_channels[] = {
CHAN2G(1, 2412, 0),
@@ -1270,7 +1269,6 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
/* report network only if the current channel set contains the channel to which this network belongs */
if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
- && rtw_mlme_band_check(padapter, pnetwork->network.Configuration.DSConfig) == true
&& true == rtw_validate_ssid(&(pnetwork->network.Ssid))
)
{
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 5032701171f6..afefc2c8a2ac 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -1303,7 +1303,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
/* report network only if the current channel set contains the channel to which this network belongs */
if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, pnetwork->network.Configuration.DSConfig) >= 0
- && rtw_mlme_band_check(padapter, pnetwork->network.Configuration.DSConfig) == true
&& true == rtw_validate_ssid(&(pnetwork->network.Ssid))) {
ev = translate_scan(padapter, a, pnetwork, ev, stop);
--
2.20.1
remove 5Ghz code related to RF calibration. Remove
table arrays, variables and macros related to RF power
tracking.
Signed-off-by: Fabio Aiuto <[email protected]>
---
.../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 77 -------------------
.../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 17 +---
drivers/staging/rtl8723bs/hal/odm.c | 8 --
drivers/staging/rtl8723bs/hal/odm.h | 14 +---
4 files changed, 2 insertions(+), 114 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
index f49032dc5bef..00d429977ea9 100644
--- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
+++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
@@ -282,62 +282,6 @@ void ODM_ReadAndConfig_MP_8723B_RadioA(struct dm_odm_t *pDM_Odm)
* TxPowerTrack_SDIO.TXT
******************************************************************************/
-static u8 gDeltaSwingTableIdx_MP_5GB_N_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {
- {
- 0, 1, 1, 2, 2, 3, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9,
- 9, 10, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10,
- 10, 11, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10,
- 10, 11, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14
- },
-};
-static u8 gDeltaSwingTableIdx_MP_5GB_P_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, 12,
- 12, 13, 14, 15, 15, 16, 16, 17, 17, 18, 19, 20, 20, 20
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, 12,
- 12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 19, 20, 20, 20
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, 12,
- 12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 20, 21, 21, 21
- },
-};
-static u8 gDeltaSwingTableIdx_MP_5GA_N_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {
- {
- 0, 1, 2, 3, 3, 4, 4, 5, 5, 6, 7, 8, 8, 9, 9, 10,
- 10, 11, 11, 12, 12, 13, 13, 14, 14, 14, 14, 14, 14, 14
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 6, 7, 7, 8, 8, 9, 10,
- 11, 11, 12, 13, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 10, 11,
- 11, 12, 13, 14, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16
- },
-};
-static u8 gDeltaSwingTableIdx_MP_5GA_P_TxPowerTrack_SDIO_8723B[][DELTA_SWINGIDX_SIZE] = {
- {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, 12,
- 12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 20, 21, 21, 21
- },
- {
- 0, 1, 2, 3, 3, 4, 5, 6, 6, 7, 8, 9, 9, 10, 11, 12,
- 12, 13, 14, 15, 15, 16, 17, 18, 18, 19, 20, 21, 21, 21
- },
-};
static u8 gDeltaSwingTableIdx_MP_2GB_N_TxPowerTrack_SDIO_8723B[] = {
0, 0, 1, 2, 2, 2, 3, 3, 3, 4, 5, 5, 6, 6, 6, 6,
7, 7, 7, 8, 8, 9, 9, 10, 10, 11, 12, 13, 14, 15
@@ -417,27 +361,6 @@ void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct dm_odm_t *pDM_Odm)
gDeltaSwingTableIdx_MP_2GCCKB_N_TxPowerTrack_SDIO_8723B,
DELTA_SWINGIDX_SIZE
);
-
- memcpy(
- pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P,
- gDeltaSwingTableIdx_MP_5GA_P_TxPowerTrack_SDIO_8723B,
- DELTA_SWINGIDX_SIZE*3
- );
- memcpy(
- pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N,
- gDeltaSwingTableIdx_MP_5GA_N_TxPowerTrack_SDIO_8723B,
- DELTA_SWINGIDX_SIZE*3
- );
- memcpy(
- pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P,
- gDeltaSwingTableIdx_MP_5GB_P_TxPowerTrack_SDIO_8723B,
- DELTA_SWINGIDX_SIZE*3
- );
- memcpy(
- pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N,
- gDeltaSwingTableIdx_MP_5GB_N_TxPowerTrack_SDIO_8723B,
- DELTA_SWINGIDX_SIZE*3
- );
}
/******************************************************************************
diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index 9fa91023abfd..8121b8eb45b6 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -347,22 +347,7 @@ static void GetDeltaSwingTable_8723B(
*TemperatureUP_B = pRFCalibrateInfo->DeltaSwingTableIdx_2GB_P;
*TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_2GB_N;
}
- } /*else if (36 <= channel && channel <= 64) {
- *TemperatureUP_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P[0];
- *TemperatureDOWN_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N[0];
- *TemperatureUP_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P[0];
- *TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N[0];
- } else if (100 <= channel && channel <= 140) {
- *TemperatureUP_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P[1];
- *TemperatureDOWN_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N[1];
- *TemperatureUP_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P[1];
- *TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N[1];
- } else if (149 <= channel && channel <= 173) {
- *TemperatureUP_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_P[2];
- *TemperatureDOWN_A = pRFCalibrateInfo->DeltaSwingTableIdx_5GA_N[2];
- *TemperatureUP_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_P[2];
- *TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_5GB_N[2];
- }*/else {
+ } else {
*TemperatureUP_A = (u8 *)DeltaSwingTableIdx_2GA_P_8188E;
*TemperatureDOWN_A = (u8 *)DeltaSwingTableIdx_2GA_N_8188E;
*TemperatureUP_B = (u8 *)DeltaSwingTableIdx_2GA_P_8188E;
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 0307ea383806..4c959efd447a 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -896,18 +896,10 @@ void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 V
pDM_Odm->ExtLNA = (u8)Value;
break;
- case ODM_CMNINFO_5G_EXT_LNA:
- pDM_Odm->ExtLNA5G = (u8)Value;
- break;
-
case ODM_CMNINFO_EXT_PA:
pDM_Odm->ExtPA = (u8)Value;
break;
- case ODM_CMNINFO_5G_EXT_PA:
- pDM_Odm->ExtPA5G = (u8)Value;
- break;
-
case ODM_CMNINFO_GPA:
pDM_Odm->TypeGPA = (enum odm_type_gpa_e)Value;
break;
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index afb36de7a4e5..a5bca7d7826a 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -151,7 +151,6 @@ struct swat_t { /* _SW_Antenna_Switch_ */
bool ANTB_ON; /* To indicate Ant B is on or not */
bool Pre_Aux_FailDetec;
bool RSSI_AntDect_bResult;
- u8 Ant5G;
u8 Ant2G;
s32 RSSI_sum_A;
@@ -295,9 +294,7 @@ enum odm_cmninfo_e {
ODM_CMNINFO_BOARD_TYPE, /* ODM_BOARD_TYPE_E */
ODM_CMNINFO_PACKAGE_TYPE,
ODM_CMNINFO_EXT_LNA, /* true */
- ODM_CMNINFO_5G_EXT_LNA,
ODM_CMNINFO_EXT_PA,
- ODM_CMNINFO_5G_EXT_PA,
ODM_CMNINFO_GPA,
ODM_CMNINFO_APA,
ODM_CMNINFO_GLNA,
@@ -514,7 +511,6 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */
bool bTXPowerTracking;
u8 TxPowerTrackControl; /* for mp mode, turn off txpwrtracking as default */
u8 TM_Trigger;
- u8 InternalPA5G[2]; /* pathA / pathB */
u8 ThermalMeter[2]; /* ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 */
u8 ThermalValue;
@@ -549,7 +545,7 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */
bool bIQKInProgress;
u8 Delta_IQK;
u8 Delta_LCK;
- s8 BBSwingDiff2G, BBSwingDiff5G; /* Unit: dB */
+ s8 BBSwingDiff2G; /* Unit: dB */
u8 DeltaSwingTableIdx_2GCCKA_P[DELTA_SWINGIDX_SIZE];
u8 DeltaSwingTableIdx_2GCCKA_N[DELTA_SWINGIDX_SIZE];
u8 DeltaSwingTableIdx_2GCCKB_P[DELTA_SWINGIDX_SIZE];
@@ -558,10 +554,6 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */
u8 DeltaSwingTableIdx_2GA_N[DELTA_SWINGIDX_SIZE];
u8 DeltaSwingTableIdx_2GB_P[DELTA_SWINGIDX_SIZE];
u8 DeltaSwingTableIdx_2GB_N[DELTA_SWINGIDX_SIZE];
- u8 DeltaSwingTableIdx_5GA_P[BAND_NUM][DELTA_SWINGIDX_SIZE];
- u8 DeltaSwingTableIdx_5GA_N[BAND_NUM][DELTA_SWINGIDX_SIZE];
- u8 DeltaSwingTableIdx_5GB_P[BAND_NUM][DELTA_SWINGIDX_SIZE];
- u8 DeltaSwingTableIdx_5GB_N[BAND_NUM][DELTA_SWINGIDX_SIZE];
u8 DeltaSwingTableIdx_2GA_P_8188E[DELTA_SWINGIDX_SIZE];
u8 DeltaSwingTableIdx_2GA_N_8188E[DELTA_SWINGIDX_SIZE];
@@ -627,7 +619,6 @@ struct fat_t { /* _FAST_ANTENNA_TRAINNING_ */
bool bBecomeLinked;
u32 MinMaxRSSI;
u8 idx_AntDiv_counter_2G;
- u8 idx_AntDiv_counter_5G;
u32 CCK_counter_main;
u32 CCK_counter_aux;
u32 OFDM_counter_main;
@@ -746,10 +737,8 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */
u8 TypeAPA;
/* with external LNA NO/Yes = 0/1 */
u8 ExtLNA;
- u8 ExtLNA5G;
/* with external PA NO/Yes = 0/1 */
u8 ExtPA;
- u8 ExtPA5G;
/* with external TRSW NO/Yes = 0/1 */
u8 ExtTRSW;
u8 PatchID; /* Customer ID */
@@ -1046,7 +1035,6 @@ enum ODM_BB_Config_Type {
CONFIG_BB_PHY_REG,
CONFIG_BB_AGC_TAB,
CONFIG_BB_AGC_TAB_2G,
- CONFIG_BB_AGC_TAB_5G,
CONFIG_BB_PHY_REG_PG,
CONFIG_BB_PHY_REG_MP,
CONFIG_BB_AGC_TAB_DIFF,
--
2.20.1
fix IQK_Matrix_Settings_NUM macro value to 14 which is
the max channel number value allowed in a 2.4Ghz device.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/hal/odm.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index c349de205f93..abf6547518fb 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -195,10 +195,7 @@ struct odm_rate_adaptive {
#define AVG_THERMAL_NUM 8
#define IQK_Matrix_REG_NUM 8
-#define IQK_Matrix_Settings_NUM (14 + 24 + 21) /* Channels_2_4G_NUM
- * + Channels_5G_20M_NUM
- * + Channels_5G
- */
+#define IQK_Matrix_Settings_NUM 14 /* Channels_2_4G_NUM */
#define DM_Type_ByFW 0
#define DM_Type_ByDriver 1
--
2.20.1
remove VHT dead code, as the device doesn't support
VHT (which is a 802.11ac capability).
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
drivers/staging/rtl8723bs/hal/hal_com.c | 241 -----------
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 383 +-----------------
drivers/staging/rtl8723bs/include/hal_com.h | 62 +--
.../rtl8723bs/include/hal_com_phycfg.h | 4 -
drivers/staging/rtl8723bs/include/ieee80211.h | 45 --
.../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
8 files changed, 9 insertions(+), 752 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 285acd3d843b..c128d462c6c7 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -46,7 +46,6 @@ static struct action_handler OnAction_tbl[] = {
{RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved},
{RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved},
{RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved},
- {RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &DoReserved},
{RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved},
};
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 7a88447f8294..eebd48438733 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -295,126 +295,6 @@ u8 MRateToHwRate(u8 rate)
case MGN_MCS31:
ret = DESC_RATEMCS31;
break;
- case MGN_VHT1SS_MCS0:
- ret = DESC_RATEVHTSS1MCS0;
- break;
- case MGN_VHT1SS_MCS1:
- ret = DESC_RATEVHTSS1MCS1;
- break;
- case MGN_VHT1SS_MCS2:
- ret = DESC_RATEVHTSS1MCS2;
- break;
- case MGN_VHT1SS_MCS3:
- ret = DESC_RATEVHTSS1MCS3;
- break;
- case MGN_VHT1SS_MCS4:
- ret = DESC_RATEVHTSS1MCS4;
- break;
- case MGN_VHT1SS_MCS5:
- ret = DESC_RATEVHTSS1MCS5;
- break;
- case MGN_VHT1SS_MCS6:
- ret = DESC_RATEVHTSS1MCS6;
- break;
- case MGN_VHT1SS_MCS7:
- ret = DESC_RATEVHTSS1MCS7;
- break;
- case MGN_VHT1SS_MCS8:
- ret = DESC_RATEVHTSS1MCS8;
- break;
- case MGN_VHT1SS_MCS9:
- ret = DESC_RATEVHTSS1MCS9;
- break;
- case MGN_VHT2SS_MCS0:
- ret = DESC_RATEVHTSS2MCS0;
- break;
- case MGN_VHT2SS_MCS1:
- ret = DESC_RATEVHTSS2MCS1;
- break;
- case MGN_VHT2SS_MCS2:
- ret = DESC_RATEVHTSS2MCS2;
- break;
- case MGN_VHT2SS_MCS3:
- ret = DESC_RATEVHTSS2MCS3;
- break;
- case MGN_VHT2SS_MCS4:
- ret = DESC_RATEVHTSS2MCS4;
- break;
- case MGN_VHT2SS_MCS5:
- ret = DESC_RATEVHTSS2MCS5;
- break;
- case MGN_VHT2SS_MCS6:
- ret = DESC_RATEVHTSS2MCS6;
- break;
- case MGN_VHT2SS_MCS7:
- ret = DESC_RATEVHTSS2MCS7;
- break;
- case MGN_VHT2SS_MCS8:
- ret = DESC_RATEVHTSS2MCS8;
- break;
- case MGN_VHT2SS_MCS9:
- ret = DESC_RATEVHTSS2MCS9;
- break;
- case MGN_VHT3SS_MCS0:
- ret = DESC_RATEVHTSS3MCS0;
- break;
- case MGN_VHT3SS_MCS1:
- ret = DESC_RATEVHTSS3MCS1;
- break;
- case MGN_VHT3SS_MCS2:
- ret = DESC_RATEVHTSS3MCS2;
- break;
- case MGN_VHT3SS_MCS3:
- ret = DESC_RATEVHTSS3MCS3;
- break;
- case MGN_VHT3SS_MCS4:
- ret = DESC_RATEVHTSS3MCS4;
- break;
- case MGN_VHT3SS_MCS5:
- ret = DESC_RATEVHTSS3MCS5;
- break;
- case MGN_VHT3SS_MCS6:
- ret = DESC_RATEVHTSS3MCS6;
- break;
- case MGN_VHT3SS_MCS7:
- ret = DESC_RATEVHTSS3MCS7;
- break;
- case MGN_VHT3SS_MCS8:
- ret = DESC_RATEVHTSS3MCS8;
- break;
- case MGN_VHT3SS_MCS9:
- ret = DESC_RATEVHTSS3MCS9;
- break;
- case MGN_VHT4SS_MCS0:
- ret = DESC_RATEVHTSS4MCS0;
- break;
- case MGN_VHT4SS_MCS1:
- ret = DESC_RATEVHTSS4MCS1;
- break;
- case MGN_VHT4SS_MCS2:
- ret = DESC_RATEVHTSS4MCS2;
- break;
- case MGN_VHT4SS_MCS3:
- ret = DESC_RATEVHTSS4MCS3;
- break;
- case MGN_VHT4SS_MCS4:
- ret = DESC_RATEVHTSS4MCS4;
- break;
- case MGN_VHT4SS_MCS5:
- ret = DESC_RATEVHTSS4MCS5;
- break;
- case MGN_VHT4SS_MCS6:
- ret = DESC_RATEVHTSS4MCS6;
- break;
- case MGN_VHT4SS_MCS7:
- ret = DESC_RATEVHTSS4MCS7;
- break;
- case MGN_VHT4SS_MCS8:
- ret = DESC_RATEVHTSS4MCS8;
- break;
- case MGN_VHT4SS_MCS9:
- ret = DESC_RATEVHTSS4MCS9;
- break;
default:
break;
}
@@ -559,127 +439,6 @@ u8 HwRateToMRate(u8 rate)
case DESC_RATEMCS31:
ret_rate = MGN_MCS31;
break;
- case DESC_RATEVHTSS1MCS0:
- ret_rate = MGN_VHT1SS_MCS0;
- break;
- case DESC_RATEVHTSS1MCS1:
- ret_rate = MGN_VHT1SS_MCS1;
- break;
- case DESC_RATEVHTSS1MCS2:
- ret_rate = MGN_VHT1SS_MCS2;
- break;
- case DESC_RATEVHTSS1MCS3:
- ret_rate = MGN_VHT1SS_MCS3;
- break;
- case DESC_RATEVHTSS1MCS4:
- ret_rate = MGN_VHT1SS_MCS4;
- break;
- case DESC_RATEVHTSS1MCS5:
- ret_rate = MGN_VHT1SS_MCS5;
- break;
- case DESC_RATEVHTSS1MCS6:
- ret_rate = MGN_VHT1SS_MCS6;
- break;
- case DESC_RATEVHTSS1MCS7:
- ret_rate = MGN_VHT1SS_MCS7;
- break;
- case DESC_RATEVHTSS1MCS8:
- ret_rate = MGN_VHT1SS_MCS8;
- break;
- case DESC_RATEVHTSS1MCS9:
- ret_rate = MGN_VHT1SS_MCS9;
- break;
- case DESC_RATEVHTSS2MCS0:
- ret_rate = MGN_VHT2SS_MCS0;
- break;
- case DESC_RATEVHTSS2MCS1:
- ret_rate = MGN_VHT2SS_MCS1;
- break;
- case DESC_RATEVHTSS2MCS2:
- ret_rate = MGN_VHT2SS_MCS2;
- break;
- case DESC_RATEVHTSS2MCS3:
- ret_rate = MGN_VHT2SS_MCS3;
- break;
- case DESC_RATEVHTSS2MCS4:
- ret_rate = MGN_VHT2SS_MCS4;
- break;
- case DESC_RATEVHTSS2MCS5:
- ret_rate = MGN_VHT2SS_MCS5;
- break;
- case DESC_RATEVHTSS2MCS6:
- ret_rate = MGN_VHT2SS_MCS6;
- break;
- case DESC_RATEVHTSS2MCS7:
- ret_rate = MGN_VHT2SS_MCS7;
- break;
- case DESC_RATEVHTSS2MCS8:
- ret_rate = MGN_VHT2SS_MCS8;
- break;
- case DESC_RATEVHTSS2MCS9:
- ret_rate = MGN_VHT2SS_MCS9;
- break;
- case DESC_RATEVHTSS3MCS0:
- ret_rate = MGN_VHT3SS_MCS0;
- break;
- case DESC_RATEVHTSS3MCS1:
- ret_rate = MGN_VHT3SS_MCS1;
- break;
- case DESC_RATEVHTSS3MCS2:
- ret_rate = MGN_VHT3SS_MCS2;
- break;
- case DESC_RATEVHTSS3MCS3:
- ret_rate = MGN_VHT3SS_MCS3;
- break;
- case DESC_RATEVHTSS3MCS4:
- ret_rate = MGN_VHT3SS_MCS4;
- break;
- case DESC_RATEVHTSS3MCS5:
- ret_rate = MGN_VHT3SS_MCS5;
- break;
- case DESC_RATEVHTSS3MCS6:
- ret_rate = MGN_VHT3SS_MCS6;
- break;
- case DESC_RATEVHTSS3MCS7:
- ret_rate = MGN_VHT3SS_MCS7;
- break;
- case DESC_RATEVHTSS3MCS8:
- ret_rate = MGN_VHT3SS_MCS8;
- break;
- case DESC_RATEVHTSS3MCS9:
- ret_rate = MGN_VHT3SS_MCS9;
- break;
- case DESC_RATEVHTSS4MCS0:
- ret_rate = MGN_VHT4SS_MCS0;
- break;
- case DESC_RATEVHTSS4MCS1:
- ret_rate = MGN_VHT4SS_MCS1;
- break;
- case DESC_RATEVHTSS4MCS2:
- ret_rate = MGN_VHT4SS_MCS2;
- break;
- case DESC_RATEVHTSS4MCS3:
- ret_rate = MGN_VHT4SS_MCS3;
- break;
- case DESC_RATEVHTSS4MCS4:
- ret_rate = MGN_VHT4SS_MCS4;
- break;
- case DESC_RATEVHTSS4MCS5:
- ret_rate = MGN_VHT4SS_MCS5;
- break;
- case DESC_RATEVHTSS4MCS6:
- ret_rate = MGN_VHT4SS_MCS6;
- break;
- case DESC_RATEVHTSS4MCS7:
- ret_rate = MGN_VHT4SS_MCS7;
- break;
- case DESC_RATEVHTSS4MCS8:
- ret_rate = MGN_VHT4SS_MCS8;
- break;
- case DESC_RATEVHTSS4MCS9:
- ret_rate = MGN_VHT4SS_MCS9;
- break;
-
default:
break;
}
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 395eb3b5af71..bb7941aee0c4 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -39,18 +39,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
case HT_MCS24_MCS31:
value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
break;
- case VHT_1SSMCS0_1SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
- break;
- case VHT_2SSMCS0_2SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
- break;
- case VHT_3SSMCS0_3SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
- break;
- case VHT_4SSMCS0_4SSMCS9:
- value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
- break;
default:
break;
}
@@ -91,18 +79,6 @@ phy_SetTxPowerByRateBase(
case HT_MCS24_MCS31:
pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
break;
- case VHT_1SSMCS0_1SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
- break;
- case VHT_2SSMCS0_2SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
- break;
- case VHT_3SSMCS0_3SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
- break;
- case VHT_4SSMCS0_4SSMCS9:
- pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
- break;
default:
break;
}
@@ -131,14 +107,6 @@ struct adapter *padapter
base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
- base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
-
- base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
- phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
}
}
@@ -442,81 +410,6 @@ PHY_GetRateValuesOfTxPowerByRate(
*RateNum = 4;
break;
- case 0xC3C:
- case 0xE3C:
- case 0x183C:
- case 0x1a3C:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS0);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS1);
- RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS2);
- RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS3);
- for (i = 0; i < 4; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
- case 0xC40:
- case 0xE40:
- case 0x1840:
- case 0x1a40:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS4);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS5);
- RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS6);
- RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS7);
- for (i = 0; i < 4; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
- case 0xC44:
- case 0xE44:
- case 0x1844:
- case 0x1a44:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS8);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS9);
- RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0);
- RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1);
- for (i = 0; i < 4; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
- case 0xC48:
- case 0xE48:
- case 0x1848:
- case 0x1a48:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS2);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS3);
- RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS4);
- RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS5);
- for (i = 0; i < 4; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
- case 0xC4C:
- case 0xE4C:
- case 0x184C:
- case 0x1a4C:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS6);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS7);
- RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS8);
- RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS9);
- for (i = 0; i < 4; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
case 0xCD8:
case 0xED8:
case 0x18D8:
@@ -547,49 +440,6 @@ PHY_GetRateValuesOfTxPowerByRate(
*RateNum = 4;
break;
- case 0xCE0:
- case 0xEE0:
- case 0x18E0:
- case 0x1aE0:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS0);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS1);
- RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS2);
- RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS3);
- for (i = 0; i < 4; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
- case 0xCE4:
- case 0xEE4:
- case 0x18E4:
- case 0x1aE4:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS4);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS5);
- RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS6);
- RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS7);
- for (i = 0; i < 4; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
- case 0xCE8:
- case 0xEE8:
- case 0x18E8:
- case 0x1aE8:
- RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS8);
- RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS9);
- for (i = 0; i < 2; ++i) {
- PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
- ((Value >> (i * 8)) & 0xF));
- }
- *RateNum = 4;
- break;
-
default:
break;
}
@@ -617,10 +467,6 @@ static void PHY_StoreTxPowerByRateNew(
return;
for (i = 0; i < rateNum; ++i) {
- if (rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0) ||
- rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1))
- TxNum = RF_2TX;
-
pHalData->TxPwrByRateOffset[RfPath][TxNum][rateIndex[i]] = PwrByRateVal[i];
}
}
@@ -691,18 +537,6 @@ struct adapter *padapter
u8 mcs16_23Rates[8] = {
MGN_MCS16, MGN_MCS17, MGN_MCS18, MGN_MCS19, MGN_MCS20, MGN_MCS21, MGN_MCS22, MGN_MCS23
};
- u8 vht1ssRates[10] = {
- MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
- MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9
- };
- u8 vht2ssRates[10] = {
- MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
- MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9
- };
- u8 vht3ssRates[10] = {
- MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
- MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9
- };
for (path = ODM_RF_PATH_A; path <= ODM_RF_PATH_D; ++path) {
for (txNum = RF_1TX; txNum < RF_MAX_TX_NUM; ++txNum) {
@@ -740,27 +574,6 @@ struct adapter *padapter
value = PHY_GetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i]);
PHY_SetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i], value - base);
}
-
- /* VHT 1SS */
- base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT1SS_MCS7);
- for (i = 0; i < sizeof(vht1ssRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, path, txNum, vht1ssRates[i]);
- PHY_SetTxPowerByRate(padapter, path, txNum, vht1ssRates[i], value - base);
- }
-
- /* VHT 2SS */
- base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT2SS_MCS7);
- for (i = 0; i < sizeof(vht2ssRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, path, txNum, vht2ssRates[i]);
- PHY_SetTxPowerByRate(padapter, path, txNum, vht2ssRates[i], value - base);
- }
-
- /* VHT 3SS */
- base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT3SS_MCS7);
- for (i = 0; i < sizeof(vht3ssRates); ++i) {
- value = PHY_GetTxPowerByRate(padapter, path, txNum, vht3ssRates[i]);
- PHY_SetTxPowerByRate(padapter, path, txNum, vht3ssRates[i], value - base);
- }
}
}
}
@@ -823,38 +636,6 @@ void PHY_SetTxPowerIndexByRateSection(
Channel, htRates4T,
ARRAY_SIZE(htRates4T));
- } else if (RateSection == VHT_1SSMCS0_1SSMCS9) {
- u8 vhtRates1T[] = {MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
- MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9};
- PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
- pHalData->CurrentChannelBW,
- Channel, vhtRates1T,
- ARRAY_SIZE(vhtRates1T));
-
- } else if (RateSection == VHT_2SSMCS0_2SSMCS9) {
- u8 vhtRates2T[] = {MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
- MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9};
-
- PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
- pHalData->CurrentChannelBW,
- Channel, vhtRates2T,
- ARRAY_SIZE(vhtRates2T));
- } else if (RateSection == VHT_3SSMCS0_3SSMCS9) {
- u8 vhtRates3T[] = {MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
- MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9};
-
- PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
- pHalData->CurrentChannelBW,
- Channel, vhtRates3T,
- ARRAY_SIZE(vhtRates3T));
- } else if (RateSection == VHT_4SSMCS0_4SSMCS9) {
- u8 vhtRates4T[] = {MGN_VHT4SS_MCS0, MGN_VHT4SS_MCS1, MGN_VHT4SS_MCS2, MGN_VHT4SS_MCS3, MGN_VHT4SS_MCS4,
- MGN_VHT4SS_MCS5, MGN_VHT4SS_MCS6, MGN_VHT4SS_MCS7, MGN_VHT4SS_MCS8, MGN_VHT4SS_MCS9};
-
- PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
- pHalData->CurrentChannelBW,
- Channel, vhtRates4T,
- ARRAY_SIZE(vhtRates4T));
}
}
@@ -883,23 +664,23 @@ u8 PHY_GetTxPowerIndexBase(
txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S];
if (BandWidth == CHANNEL_WIDTH_20) { /* BW20-1S, BW20-2S */
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW20_24G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW20_24G_Diff[RFPath][TX_3S];
- if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW20_24G_Diff[RFPath][TX_4S];
} else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */
- if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
- if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S];
- if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S];
- if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
+ if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
}
@@ -1060,126 +841,6 @@ u8 PHY_GetRateIndexOfTxPowerByRate(u8 Rate)
case MGN_MCS31:
index = 43;
break;
- case MGN_VHT1SS_MCS0:
- index = 44;
- break;
- case MGN_VHT1SS_MCS1:
- index = 45;
- break;
- case MGN_VHT1SS_MCS2:
- index = 46;
- break;
- case MGN_VHT1SS_MCS3:
- index = 47;
- break;
- case MGN_VHT1SS_MCS4:
- index = 48;
- break;
- case MGN_VHT1SS_MCS5:
- index = 49;
- break;
- case MGN_VHT1SS_MCS6:
- index = 50;
- break;
- case MGN_VHT1SS_MCS7:
- index = 51;
- break;
- case MGN_VHT1SS_MCS8:
- index = 52;
- break;
- case MGN_VHT1SS_MCS9:
- index = 53;
- break;
- case MGN_VHT2SS_MCS0:
- index = 54;
- break;
- case MGN_VHT2SS_MCS1:
- index = 55;
- break;
- case MGN_VHT2SS_MCS2:
- index = 56;
- break;
- case MGN_VHT2SS_MCS3:
- index = 57;
- break;
- case MGN_VHT2SS_MCS4:
- index = 58;
- break;
- case MGN_VHT2SS_MCS5:
- index = 59;
- break;
- case MGN_VHT2SS_MCS6:
- index = 60;
- break;
- case MGN_VHT2SS_MCS7:
- index = 61;
- break;
- case MGN_VHT2SS_MCS8:
- index = 62;
- break;
- case MGN_VHT2SS_MCS9:
- index = 63;
- break;
- case MGN_VHT3SS_MCS0:
- index = 64;
- break;
- case MGN_VHT3SS_MCS1:
- index = 65;
- break;
- case MGN_VHT3SS_MCS2:
- index = 66;
- break;
- case MGN_VHT3SS_MCS3:
- index = 67;
- break;
- case MGN_VHT3SS_MCS4:
- index = 68;
- break;
- case MGN_VHT3SS_MCS5:
- index = 69;
- break;
- case MGN_VHT3SS_MCS6:
- index = 70;
- break;
- case MGN_VHT3SS_MCS7:
- index = 71;
- break;
- case MGN_VHT3SS_MCS8:
- index = 72;
- break;
- case MGN_VHT3SS_MCS9:
- index = 73;
- break;
- case MGN_VHT4SS_MCS0:
- index = 74;
- break;
- case MGN_VHT4SS_MCS1:
- index = 75;
- break;
- case MGN_VHT4SS_MCS2:
- index = 76;
- break;
- case MGN_VHT4SS_MCS3:
- index = 77;
- break;
- case MGN_VHT4SS_MCS4:
- index = 78;
- break;
- case MGN_VHT4SS_MCS5:
- index = 79;
- break;
- case MGN_VHT4SS_MCS6:
- index = 80;
- break;
- case MGN_VHT4SS_MCS7:
- index = 81;
- break;
- case MGN_VHT4SS_MCS8:
- index = 82;
- break;
- case MGN_VHT4SS_MCS9:
- index = 83;
- break;
default:
break;
}
@@ -1319,26 +980,6 @@ static s16 get_rate_sctn_idx(const u8 rate)
case MGN_MCS24: case MGN_MCS25: case MGN_MCS26: case MGN_MCS27:
case MGN_MCS28: case MGN_MCS29: case MGN_MCS30: case MGN_MCS31:
return 5;
- case MGN_VHT1SS_MCS0: case MGN_VHT1SS_MCS1: case MGN_VHT1SS_MCS2:
- case MGN_VHT1SS_MCS3: case MGN_VHT1SS_MCS4: case MGN_VHT1SS_MCS5:
- case MGN_VHT1SS_MCS6: case MGN_VHT1SS_MCS7: case MGN_VHT1SS_MCS8:
- case MGN_VHT1SS_MCS9:
- return 6;
- case MGN_VHT2SS_MCS0: case MGN_VHT2SS_MCS1: case MGN_VHT2SS_MCS2:
- case MGN_VHT2SS_MCS3: case MGN_VHT2SS_MCS4: case MGN_VHT2SS_MCS5:
- case MGN_VHT2SS_MCS6: case MGN_VHT2SS_MCS7: case MGN_VHT2SS_MCS8:
- case MGN_VHT2SS_MCS9:
- return 7;
- case MGN_VHT3SS_MCS0: case MGN_VHT3SS_MCS1: case MGN_VHT3SS_MCS2:
- case MGN_VHT3SS_MCS3: case MGN_VHT3SS_MCS4: case MGN_VHT3SS_MCS5:
- case MGN_VHT3SS_MCS6: case MGN_VHT3SS_MCS7: case MGN_VHT3SS_MCS8:
- case MGN_VHT3SS_MCS9:
- return 8;
- case MGN_VHT4SS_MCS0: case MGN_VHT4SS_MCS1: case MGN_VHT4SS_MCS2:
- case MGN_VHT4SS_MCS3: case MGN_VHT4SS_MCS4: case MGN_VHT4SS_MCS5:
- case MGN_VHT4SS_MCS6: case MGN_VHT4SS_MCS7: case MGN_VHT4SS_MCS8:
- case MGN_VHT4SS_MCS9:
- return 9;
default:
return -1;
}
@@ -1510,14 +1151,6 @@ void PHY_SetTxPowerLimit(
rateSection = 4;
else if (eqNByte(RateSection, (u8 *)("HT"), 2) && eqNByte(RfPath, (u8 *)("4T"), 2))
rateSection = 5;
- else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("1T"), 2))
- rateSection = 6;
- else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("2T"), 2))
- rateSection = 7;
- else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("3T"), 2))
- rateSection = 8;
- else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("4T"), 2))
- rateSection = 9;
else
return;
diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
index 6bcc443d59fb..1bc332261b2a 100644
--- a/drivers/staging/rtl8723bs/include/hal_com.h
+++ b/drivers/staging/rtl8723bs/include/hal_com.h
@@ -69,46 +69,6 @@
#define DESC_RATEMCS29 0x29
#define DESC_RATEMCS30 0x2A
#define DESC_RATEMCS31 0x2B
-#define DESC_RATEVHTSS1MCS0 0x2C
-#define DESC_RATEVHTSS1MCS1 0x2D
-#define DESC_RATEVHTSS1MCS2 0x2E
-#define DESC_RATEVHTSS1MCS3 0x2F
-#define DESC_RATEVHTSS1MCS4 0x30
-#define DESC_RATEVHTSS1MCS5 0x31
-#define DESC_RATEVHTSS1MCS6 0x32
-#define DESC_RATEVHTSS1MCS7 0x33
-#define DESC_RATEVHTSS1MCS8 0x34
-#define DESC_RATEVHTSS1MCS9 0x35
-#define DESC_RATEVHTSS2MCS0 0x36
-#define DESC_RATEVHTSS2MCS1 0x37
-#define DESC_RATEVHTSS2MCS2 0x38
-#define DESC_RATEVHTSS2MCS3 0x39
-#define DESC_RATEVHTSS2MCS4 0x3A
-#define DESC_RATEVHTSS2MCS5 0x3B
-#define DESC_RATEVHTSS2MCS6 0x3C
-#define DESC_RATEVHTSS2MCS7 0x3D
-#define DESC_RATEVHTSS2MCS8 0x3E
-#define DESC_RATEVHTSS2MCS9 0x3F
-#define DESC_RATEVHTSS3MCS0 0x40
-#define DESC_RATEVHTSS3MCS1 0x41
-#define DESC_RATEVHTSS3MCS2 0x42
-#define DESC_RATEVHTSS3MCS3 0x43
-#define DESC_RATEVHTSS3MCS4 0x44
-#define DESC_RATEVHTSS3MCS5 0x45
-#define DESC_RATEVHTSS3MCS6 0x46
-#define DESC_RATEVHTSS3MCS7 0x47
-#define DESC_RATEVHTSS3MCS8 0x48
-#define DESC_RATEVHTSS3MCS9 0x49
-#define DESC_RATEVHTSS4MCS0 0x4A
-#define DESC_RATEVHTSS4MCS1 0x4B
-#define DESC_RATEVHTSS4MCS2 0x4C
-#define DESC_RATEVHTSS4MCS3 0x4D
-#define DESC_RATEVHTSS4MCS4 0x4E
-#define DESC_RATEVHTSS4MCS5 0x4F
-#define DESC_RATEVHTSS4MCS6 0x50
-#define DESC_RATEVHTSS4MCS7 0x51
-#define DESC_RATEVHTSS4MCS8 0x52
-#define DESC_RATEVHTSS4MCS9 0x53
#define HDATA_RATE(rate)\
(rate == DESC_RATE1M) ? "CCK_1M" : \
@@ -138,27 +98,7 @@
(rate == DESC_RATEMCS12) ? "MCS12" : \
(rate == DESC_RATEMCS13) ? "MCS13" : \
(rate == DESC_RATEMCS14) ? "MCS14" : \
-(rate == DESC_RATEMCS15) ? "MCS15" : \
-(rate == DESC_RATEVHTSS1MCS0) ? "VHTSS1MCS0" : \
-(rate == DESC_RATEVHTSS1MCS1) ? "VHTSS1MCS1" : \
-(rate == DESC_RATEVHTSS1MCS2) ? "VHTSS1MCS2" : \
-(rate == DESC_RATEVHTSS1MCS3) ? "VHTSS1MCS3" : \
-(rate == DESC_RATEVHTSS1MCS4) ? "VHTSS1MCS4" : \
-(rate == DESC_RATEVHTSS1MCS5) ? "VHTSS1MCS5" : \
-(rate == DESC_RATEVHTSS1MCS6) ? "VHTSS1MCS6" : \
-(rate == DESC_RATEVHTSS1MCS7) ? "VHTSS1MCS7" : \
-(rate == DESC_RATEVHTSS1MCS8) ? "VHTSS1MCS8" : \
-(rate == DESC_RATEVHTSS1MCS9) ? "VHTSS1MCS9" : \
-(rate == DESC_RATEVHTSS2MCS0) ? "VHTSS2MCS0" : \
-(rate == DESC_RATEVHTSS2MCS1) ? "VHTSS2MCS1" : \
-(rate == DESC_RATEVHTSS2MCS2) ? "VHTSS2MCS2" : \
-(rate == DESC_RATEVHTSS2MCS3) ? "VHTSS2MCS3" : \
-(rate == DESC_RATEVHTSS2MCS4) ? "VHTSS2MCS4" : \
-(rate == DESC_RATEVHTSS2MCS5) ? "VHTSS2MCS5" : \
-(rate == DESC_RATEVHTSS2MCS6) ? "VHTSS2MCS6" : \
-(rate == DESC_RATEVHTSS2MCS7) ? "VHTSS2MCS7" : \
-(rate == DESC_RATEVHTSS2MCS8) ? "VHTSS2MCS8" : \
-(rate == DESC_RATEVHTSS2MCS9) ? "VHTSS2MCS9" : "UNKNOWN"
+(rate == DESC_RATEMCS15) ? "MCS15" : "UNKNOWN"
enum{
diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
index 3d95ab1986b1..c966d0e3e5ae 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
@@ -19,10 +19,6 @@ enum rate_section {
HT_MCS8_MCS15,
HT_MCS16_MCS23,
HT_MCS24_MCS31,
- VHT_1SSMCS0_1SSMCS9,
- VHT_2SSMCS0_2SSMCS9,
- VHT_3SSMCS0_3SSMCS9,
- VHT_4SSMCS0_4SSMCS9,
};
enum {
diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index ac88bd30b097..378c21595e05 100644
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -60,7 +60,6 @@ enum {
#define WLAN_STA_HT BIT(11)
#define WLAN_STA_WPS BIT(12)
#define WLAN_STA_MAYBE_WPS BIT(13)
-#define WLAN_STA_VHT BIT(14)
#define WLAN_STA_NONERP BIT(31)
#define IEEE_CMD_SET_WPA_PARAM 1
@@ -135,8 +134,6 @@ enum {
RATEID_IDX_BG = 6,
RATEID_IDX_G = 7,
RATEID_IDX_B = 8,
- RATEID_IDX_VHT_2SS = 9,
- RATEID_IDX_VHT_1SS = 10,
};
enum network_type {
@@ -424,51 +421,10 @@ enum {
MGN_MCS29,
MGN_MCS30,
MGN_MCS31,
- MGN_VHT1SS_MCS0,
- MGN_VHT1SS_MCS1,
- MGN_VHT1SS_MCS2,
- MGN_VHT1SS_MCS3,
- MGN_VHT1SS_MCS4,
- MGN_VHT1SS_MCS5,
- MGN_VHT1SS_MCS6,
- MGN_VHT1SS_MCS7,
- MGN_VHT1SS_MCS8,
- MGN_VHT1SS_MCS9,
- MGN_VHT2SS_MCS0,
- MGN_VHT2SS_MCS1,
- MGN_VHT2SS_MCS2,
- MGN_VHT2SS_MCS3,
- MGN_VHT2SS_MCS4,
- MGN_VHT2SS_MCS5,
- MGN_VHT2SS_MCS6,
- MGN_VHT2SS_MCS7,
- MGN_VHT2SS_MCS8,
- MGN_VHT2SS_MCS9,
- MGN_VHT3SS_MCS0,
- MGN_VHT3SS_MCS1,
- MGN_VHT3SS_MCS2,
- MGN_VHT3SS_MCS3,
- MGN_VHT3SS_MCS4,
- MGN_VHT3SS_MCS5,
- MGN_VHT3SS_MCS6,
- MGN_VHT3SS_MCS7,
- MGN_VHT3SS_MCS8,
- MGN_VHT3SS_MCS9,
- MGN_VHT4SS_MCS0,
- MGN_VHT4SS_MCS1,
- MGN_VHT4SS_MCS2,
- MGN_VHT4SS_MCS3,
- MGN_VHT4SS_MCS4,
- MGN_VHT4SS_MCS5,
- MGN_VHT4SS_MCS6,
- MGN_VHT4SS_MCS7,
- MGN_VHT4SS_MCS8,
- MGN_VHT4SS_MCS9,
MGN_UNKNOWN
};
#define IS_HT_RATE(_rate) (_rate >= MGN_MCS0 && _rate <= MGN_MCS31)
-#define IS_VHT_RATE(_rate) (_rate >= MGN_VHT1SS_MCS0 && _rate <= MGN_VHT4SS_MCS9)
#define IS_CCK_RATE(_rate) (MGN_1M == _rate || _rate == MGN_2M || _rate == MGN_5_5M || _rate == MGN_11M)
#define IS_OFDM_RATE(_rate) (MGN_6M <= _rate && _rate <= MGN_54M && _rate != MGN_11M)
@@ -625,7 +581,6 @@ enum {
RTW_WLAN_CATEGORY_TDLS = 12,
RTW_WLAN_CATEGORY_SELF_PROTECTED = 15, /* add for CONFIG_IEEE80211W, none 11w also can use */
RTW_WLAN_CATEGORY_WMM = 17,
- RTW_WLAN_CATEGORY_VHT = 21,
RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
};
diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
index 56bdc14af47d..9dd329a5208a 100644
--- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
@@ -402,27 +402,6 @@ struct txdesc_8723b {
#define DESC8723B_RATEMCS13 0x19
#define DESC8723B_RATEMCS14 0x1a
#define DESC8723B_RATEMCS15 0x1b
-#define DESC8723B_RATEVHTSS1MCS0 0x2c
-#define DESC8723B_RATEVHTSS1MCS1 0x2d
-#define DESC8723B_RATEVHTSS1MCS2 0x2e
-#define DESC8723B_RATEVHTSS1MCS3 0x2f
-#define DESC8723B_RATEVHTSS1MCS4 0x30
-#define DESC8723B_RATEVHTSS1MCS5 0x31
-#define DESC8723B_RATEVHTSS1MCS6 0x32
-#define DESC8723B_RATEVHTSS1MCS7 0x33
-#define DESC8723B_RATEVHTSS1MCS8 0x34
-#define DESC8723B_RATEVHTSS1MCS9 0x35
-#define DESC8723B_RATEVHTSS2MCS0 0x36
-#define DESC8723B_RATEVHTSS2MCS1 0x37
-#define DESC8723B_RATEVHTSS2MCS2 0x38
-#define DESC8723B_RATEVHTSS2MCS3 0x39
-#define DESC8723B_RATEVHTSS2MCS4 0x3a
-#define DESC8723B_RATEVHTSS2MCS5 0x3b
-#define DESC8723B_RATEVHTSS2MCS6 0x3c
-#define DESC8723B_RATEVHTSS2MCS7 0x3d
-#define DESC8723B_RATEVHTSS2MCS8 0x3e
-#define DESC8723B_RATEVHTSS2MCS9 0x3f
-
#define RX_HAL_IS_CCK_RATE_8723B(pDesc)\
(GET_RX_STATUS_DESC_RX_RATE_8723B(pDesc) == DESC8723B_RATE1M ||\
diff --git a/drivers/staging/rtl8723bs/include/rtw_ht.h b/drivers/staging/rtl8723bs/include/rtw_ht.h
index e3f353fe1e47..1527d8be2d7a 100644
--- a/drivers/staging/rtl8723bs/include/rtw_ht.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ht.h
@@ -42,10 +42,6 @@ enum {
HT_AGG_SIZE_16K = 1,
HT_AGG_SIZE_32K = 2,
HT_AGG_SIZE_64K = 3,
- VHT_AGG_SIZE_128K = 4,
- VHT_AGG_SIZE_256K = 5,
- VHT_AGG_SIZE_512K = 6,
- VHT_AGG_SIZE_1024K = 7,
};
enum {
--
2.20.1
remove struct rt_channel_plan_5g, for rtl8723bs works
only on 2.4Ghz band.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 58 +------------------
.../staging/rtl8723bs/include/rtw_mlme_ext.h | 5 --
drivers/staging/rtl8723bs/include/rtw_rf.h | 15 ++---
3 files changed, 8 insertions(+), 70 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 106779fb9fef..cf0079a0c179 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -79,46 +79,6 @@ static struct rt_channel_plan_2g RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
{{}, 0}, /* 0x06, RT_CHANNEL_DOMAIN_2G_NULL */
};
-static struct rt_channel_plan_5g RTW_ChannelPlan5G[RT_CHANNEL_DOMAIN_5G_MAX] = {
- {{}, 0}, /* 0x00, RT_CHANNEL_DOMAIN_5G_NULL */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}, 19}, /* 0x01, RT_CHANNEL_DOMAIN_5G_ETSI1 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165}, 24}, /* 0x02, RT_CHANNEL_DOMAIN_5G_ETSI2 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 149, 153, 157, 161, 165}, 22}, /* 0x03, RT_CHANNEL_DOMAIN_5G_ETSI3 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165}, 24}, /* 0x04, RT_CHANNEL_DOMAIN_5G_FCC1 */
- {{36, 40, 44, 48, 149, 153, 157, 161, 165}, 9}, /* 0x05, RT_CHANNEL_DOMAIN_5G_FCC2 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 149, 153, 157, 161, 165}, 13}, /* 0x06, RT_CHANNEL_DOMAIN_5G_FCC3 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 149, 153, 157, 161}, 12}, /* 0x07, RT_CHANNEL_DOMAIN_5G_FCC4 */
- {{149, 153, 157, 161, 165}, 5}, /* 0x08, RT_CHANNEL_DOMAIN_5G_FCC5 */
- {{36, 40, 44, 48, 52, 56, 60, 64}, 8}, /* 0x09, RT_CHANNEL_DOMAIN_5G_FCC6 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 136, 140, 149, 153, 157, 161, 165}, 20}, /* 0x0A, RT_CHANNEL_DOMAIN_5G_FCC7_IC1 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 149, 153, 157, 161, 165}, 20}, /* 0x0B, RT_CHANNEL_DOMAIN_5G_KCC1 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}, 19}, /* 0x0C, RT_CHANNEL_DOMAIN_5G_MKK1 */
- {{36, 40, 44, 48, 52, 56, 60, 64}, 8}, /* 0x0D, RT_CHANNEL_DOMAIN_5G_MKK2 */
- {{100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}, 11}, /* 0x0E, RT_CHANNEL_DOMAIN_5G_MKK3 */
- {{56, 60, 64, 100, 104, 108, 112, 116, 136, 140, 149, 153, 157, 161, 165}, 15}, /* 0x0F, RT_CHANNEL_DOMAIN_5G_NCC1 */
- {{56, 60, 64, 149, 153, 157, 161, 165}, 8}, /* 0x10, RT_CHANNEL_DOMAIN_5G_NCC2 */
- {{149, 153, 157, 161, 165}, 5}, /* 0x11, RT_CHANNEL_DOMAIN_5G_NCC3 */
- {{36, 40, 44, 48}, 4}, /* 0x12, RT_CHANNEL_DOMAIN_5G_ETSI4 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 136, 140, 149, 153, 157, 161, 165}, 20}, /* 0x13, RT_CHANNEL_DOMAIN_5G_ETSI5 */
- {{149, 153, 157, 161}, 4}, /* 0x14, RT_CHANNEL_DOMAIN_5G_FCC8 */
- {{36, 40, 44, 48, 52, 56, 60, 64}, 8}, /* 0x15, RT_CHANNEL_DOMAIN_5G_ETSI6 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 149, 153, 157, 161, 165}, 13}, /* 0x16, RT_CHANNEL_DOMAIN_5G_ETSI7 */
- {{36, 40, 44, 48, 149, 153, 157, 161, 165}, 9}, /* 0x17, RT_CHANNEL_DOMAIN_5G_ETSI8 */
- {{100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}, 11}, /* 0x18, RT_CHANNEL_DOMAIN_5G_ETSI9 */
- {{149, 153, 157, 161, 165}, 5}, /* 0x19, RT_CHANNEL_DOMAIN_5G_ETSI10 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 132, 136, 140, 149, 153, 157, 161, 165}, 16}, /* 0x1A, RT_CHANNEL_DOMAIN_5G_ETSI11 */
- {{52, 56, 60, 64, 100, 104, 108, 112, 116, 132, 136, 140, 149, 153, 157, 161, 165}, 17}, /* 0x1B, RT_CHANNEL_DOMAIN_5G_NCC4 */
- {{149, 153, 157, 161}, 4}, /* 0x1C, RT_CHANNEL_DOMAIN_5G_ETSI12 */
- {{36, 40, 44, 48, 100, 104, 108, 112, 116, 132, 136, 140, 149, 153, 157, 161, 165}, 17}, /* 0x1D, RT_CHANNEL_DOMAIN_5G_FCC9 */
- {{36, 40, 44, 48, 100, 104, 108, 112, 116, 132, 136, 140}, 12}, /* 0x1E, RT_CHANNEL_DOMAIN_5G_ETSI13 */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 132, 136, 140, 149, 153, 157, 161}, 20}, /* 0x1F, RT_CHANNEL_DOMAIN_5G_FCC10 */
-
- /* Driver self defined for old channel plan Compatible , Remember to modify if have new channel plan definition ===== */
- {{36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 132, 136, 140, 149, 153, 157, 161, 165}, 21}, /* 0x20, RT_CHANNEL_DOMAIN_5G_FCC */
- {{36, 40, 44, 48}, 4}, /* 0x21, RT_CHANNEL_DOMAIN_5G_JAPAN_NO_DFS */
- {{36, 40, 44, 48, 149, 153, 157, 161}, 8}, /* 0x22, RT_CHANNEL_DOMAIN_5G_FCC4_NO_DFS */
-};
-
static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
/* 0x00 ~ 0x1F , Old Define ===== */
{0x02, 0x20}, /* 0x00, RT_CHANNEL_DOMAIN_FCC */
@@ -393,8 +353,8 @@ static void init_channel_list(struct adapter *padapter, struct rt_channel_info *
static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_channel_info *channel_set)
{
u8 index, chanset_size = 0;
- u8 b5GBand = false, b2_4GBand = false;
- u8 Index2G = 0, Index5G = 0;
+ u8 b2_4GBand = false;
+ u8 Index2G = 0;
memset(channel_set, 0, sizeof(struct rt_channel_info)*MAX_CHANNEL_NUM);
@@ -433,20 +393,6 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c
}
}
- if (b5GBand) {
- for (index = 0; index < RTW_ChannelPlan5G[Index5G].Len; index++) {
- if (RTW_ChannelPlan5G[Index5G].Channel[index] <= 48
- || RTW_ChannelPlan5G[Index5G].Channel[index] >= 149) {
- channel_set[chanset_size].ChannelNum = RTW_ChannelPlan5G[Index5G].Channel[index];
- if (RT_CHANNEL_DOMAIN_WORLD_WIDE_5G == ChannelPlan)/* passive scan for all 5G channels */
- channel_set[chanset_size].ScanType = SCAN_PASSIVE;
- else
- channel_set[chanset_size].ScanType = SCAN_ACTIVE;
- chanset_size++;
- }
- }
- }
-
return chanset_size;
}
diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
index 0248b91b4525..7d655f02d383 100644
--- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h
@@ -248,11 +248,6 @@ struct rt_channel_plan_2g {
unsigned char Len;
};
-struct rt_channel_plan_5g {
- unsigned char Channel[MAX_CHANNEL_NUM_5G];
- unsigned char Len;
-};
-
struct rt_channel_plan_map {
unsigned char Index2G;
unsigned char Index5G;
diff --git a/drivers/staging/rtl8723bs/include/rtw_rf.h b/drivers/staging/rtl8723bs/include/rtw_rf.h
index 48ff15a38bb0..6c25707f4ec8 100644
--- a/drivers/staging/rtl8723bs/include/rtw_rf.h
+++ b/drivers/staging/rtl8723bs/include/rtw_rf.h
@@ -21,16 +21,13 @@
#define RTL8711_RF_MAX_SENS 6
#define RTL8711_RF_DEF_SENS 4
-/* */
-/* We now define the following channels as the max channels in each channel plan. */
-/* 2G, total 14 chnls */
-/* {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14} */
-/* 5G, total 24 chnls */
-/* {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120,
- * 124, 128, 132, 136, 140, 149, 153, 157, 161, 165} */
+/*
+ * We now define the following channels as the max channels in each channel plan.
+ * 2G, total 14 chnls
+ * {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}
+ */
#define MAX_CHANNEL_NUM_2G 14
-#define MAX_CHANNEL_NUM_5G 24
-#define MAX_CHANNEL_NUM 38/* 14+24 */
+#define MAX_CHANNEL_NUM 14
#define NUM_REGULATORYS 1
--
2.20.1
remove ODM_CMNINFO_BOARD_TYPE enum item, fix comments
accordingly (given that 5GHz code isn't supported).
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/hal/odm.c | 4 ----
drivers/staging/rtl8723bs/hal/odm.h | 5 +----
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 4c959efd447a..68dfb77772b2 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -884,10 +884,6 @@ void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 V
pDM_Odm->AntDivType = (u8)Value;
break;
- case ODM_CMNINFO_BOARD_TYPE:
- pDM_Odm->BoardType = (u8)Value;
- break;
-
case ODM_CMNINFO_PACKAGE_TYPE:
pDM_Odm->PackageType = (u8)Value;
break;
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index a5bca7d7826a..c349de205f93 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -291,7 +291,6 @@ enum odm_cmninfo_e {
ODM_CMNINFO_FAB_VER, /* ODM_FAB_E */
ODM_CMNINFO_RF_TYPE, /* ODM_RF_PATH_E or ODM_RF_TYPE_E? */
ODM_CMNINFO_RFE_TYPE,
- ODM_CMNINFO_BOARD_TYPE, /* ODM_BOARD_TYPE_E */
ODM_CMNINFO_PACKAGE_TYPE,
ODM_CMNINFO_EXT_LNA, /* true */
ODM_CMNINFO_EXT_PA,
@@ -461,9 +460,7 @@ enum { /* tag_Bandwidth_Definition */
ODM_BW40M = 1,
};
-/* ODM_CMNINFO_BOARD_TYPE */
-/* For non-AC-series IC , ODM_BOARD_5G_EXT_PA and ODM_BOARD_5G_EXT_LNA are ignored */
-/* For AC-series IC, external PA & LNA can be indivisuallly added on 2.4G and/or 5G */
+/* For AC-series IC, external PA & LNA can be individually added on 2.4G */
enum odm_type_gpa_e { /* tag_ODM_TYPE_GPA_Definition */
TYPE_GPA0 = 0,
--
2.20.1
remove all 5Ghz network types. rtl8723bs works on
802.11bgn standards and on 2.4Ghz band.
So remove all code related to 802.11a and 802.11ac
standards, which the device doesn't support.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +---
.../staging/rtl8723bs/core/rtw_ieee80211.c | 22 ++------
drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ----
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 55 -------------------
.../staging/rtl8723bs/core/rtw_wlan_util.c | 14 +----
drivers/staging/rtl8723bs/hal/odm.c | 30 ----------
drivers/staging/rtl8723bs/hal/odm.h | 3 -
.../rtl8723bs/hal/odm_EdcaTurboCheck.c | 4 +-
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 --
drivers/staging/rtl8723bs/include/hal_phy.h | 3 -
drivers/staging/rtl8723bs/include/ieee80211.h | 22 +-------
drivers/staging/rtl8723bs/include/wifi.h | 1 -
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
13 files changed, 14 insertions(+), 167 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 23bbdf084631..b0abadd4b4dd 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -343,10 +343,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
if (pcur_network->Configuration.DSConfig > 14) {
if (tx_ra_bitmap & 0xffff000)
- sta_band |= WIRELESS_11_5N;
-
- if (tx_ra_bitmap & 0xff0)
- sta_band |= WIRELESS_11A;
+ sta_band |= WIRELESS_INVALID;
} else {
if (tx_ra_bitmap & 0xffff000)
sta_band |= WIRELESS_11_24N;
@@ -412,7 +409,7 @@ void update_bmc_sta(struct adapter *padapter)
} else if (network_type == WIRELESS_INVALID) { /* error handling */
if (pcur_network->Configuration.DSConfig > 14)
- network_type = WIRELESS_11A;
+ network_type = WIRELESS_INVALID;
else
network_type = WIRELESS_11B;
}
@@ -1115,9 +1112,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
case WIRELESS_11BG_24N:
pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
break;
- case WIRELESS_11A:
- pbss_network->NetworkTypeInUse = Ndis802_11OFDM5;
- break;
default:
pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
break;
diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index e341789954b9..0f0fcd9dc652 100644
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
@@ -96,10 +96,7 @@ bool rtw_is_cckratesonly_included(u8 *rate)
int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)
{
if (channel > 14) {
- if (rtw_is_cckrates_included(rate))
- return WIRELESS_INVALID;
- else
- return WIRELESS_11A;
+ return WIRELESS_INVALID;
} else { /* could be pure B, pure G, or B/G */
if (rtw_is_cckratesonly_included(rate))
return WIRELESS_11B;
@@ -266,10 +263,6 @@ void rtw_set_supported_rate(u8 *SupportedRates, uint mode)
break;
case WIRELESS_11G:
- case WIRELESS_11A:
- case WIRELESS_11_5N:
- case WIRELESS_11A_5N:/* Todo: no basic rate for ofdm ? */
- case WIRELESS_11_5AC:
memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
break;
@@ -327,14 +320,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz);
/* supported rates */
- if (pregistrypriv->wireless_mode == WIRELESS_11ABGN) {
- if (pdev_network->Configuration.DSConfig > 14)
- wireless_mode = WIRELESS_11A_5N;
- else
- wireless_mode = WIRELESS_11BG_24N;
- } else {
- wireless_mode = pregistrypriv->wireless_mode;
- }
+ wireless_mode = pregistrypriv->wireless_mode;
rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
@@ -359,8 +345,8 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
}
/* HT Cap. */
- if (((pregistrypriv->wireless_mode&WIRELESS_11_5N) || (pregistrypriv->wireless_mode&WIRELESS_11_24N))
- && (pregistrypriv->ht_enable == true)) {
+ if ((pregistrypriv->wireless_mode & WIRELESS_11_24N) &&
+ (pregistrypriv->ht_enable == true)) {
/* todo: */
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 158f92d4d882..2dd75e007239 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2184,16 +2184,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
case WIRELESS_11BG_24N:
pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
break;
- case WIRELESS_11A:
- case WIRELESS_11A_5N:
- pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
- break;
- case WIRELESS_11ABGN:
- if (pregistrypriv->channel > 14)
- pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
- else
- pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
- break;
default:
/* TODO */
break;
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 4df3cba97f42..106779fb9fef 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -4478,61 +4478,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
}
}
- if (pregistrypriv->wireless_mode & WIRELESS_11A) {
- do {
- if ((i == MAX_CHANNEL_NUM) ||
- (chplan_sta[i].ChannelNum == 0))
- break;
-
- if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] == 0))
- break;
-
- if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) {
- chplan_new[k].ChannelNum = chplan_ap.Channel[j];
- chplan_new[k].ScanType = SCAN_ACTIVE;
- i++;
- j++;
- k++;
- } else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) {
- chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
-/* chplan_new[k].ScanType = chplan_sta[i].ScanType; */
- chplan_new[k].ScanType = SCAN_PASSIVE;
- i++;
- k++;
- } else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) {
- chplan_new[k].ChannelNum = chplan_ap.Channel[j];
- chplan_new[k].ScanType = SCAN_ACTIVE;
- j++;
- k++;
- }
- } while (1);
-
- /* change AP not support channel to Passive scan */
- while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
- chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
-/* chplan_new[k].ScanType = chplan_sta[i].ScanType; */
- chplan_new[k].ScanType = SCAN_PASSIVE;
- i++;
- k++;
- }
-
- /* add channel AP supported */
- while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] != 0)) {
- chplan_new[k].ChannelNum = chplan_ap.Channel[j];
- chplan_new[k].ScanType = SCAN_ACTIVE;
- j++;
- k++;
- }
- } else {
- /* keep original STA 5G channel plan */
- while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
- chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
- chplan_new[k].ScanType = chplan_sta[i].ScanType;
- i++;
- k++;
- }
- }
-
pmlmeext->update_channel_plan_by_ap_done = 1;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index afabb9d48021..2a47d678de01 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -55,9 +55,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
if (cur_rf_type == RF_1T1R) {
rf_type = RF_1T1R;
- } else if (IsSupportedVHT(psta->wireless_mode)) {
- if (psta->ra_mask & 0xffc00000)
- rf_type = RF_2T2R;
} else if (IsSupportedHT(psta->wireless_mode)) {
if (psta->ra_mask & 0xfff00000)
rf_type = RF_2T2R;
@@ -67,7 +64,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
case WIRELESS_11B:
raid = RATEID_IDX_B;
break;
- case WIRELESS_11A:
case WIRELESS_11G:
raid = RATEID_IDX_G;
break;
@@ -75,8 +71,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
raid = RATEID_IDX_BG;
break;
case WIRELESS_11_24N:
- case WIRELESS_11_5N:
- case WIRELESS_11A_5N:
case WIRELESS_11G_24N:
if (rf_type == RF_2T2R)
raid = RATEID_IDX_GN_N2SS;
@@ -827,7 +821,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
AIFS = aSifsTime + (2 * pmlmeinfo->slotTime);
- if (pmlmeext->cur_wireless_mode & (WIRELESS_11G | WIRELESS_11A)) {
+ if (pmlmeext->cur_wireless_mode & WIRELESS_11G) {
ECWMin = 4;
ECWMax = 10;
} else if (pmlmeext->cur_wireless_mode & WIRELESS_11B) {
@@ -1623,7 +1617,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
} else {
/* Filen: See 802.11-2007 p.90 */
- if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N | WIRELESS_11A | WIRELESS_11_5N | WIRELESS_11AC)) {
+ if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N)) {
pmlmeinfo->slotTime = SHORT_SLOT_TIME;
} else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G)) {
if ((updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */)
@@ -1653,9 +1647,7 @@ void update_wireless_mode(struct adapter *padapter)
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
pmlmeinfo->HT_enable = 1;
- if (pmlmeinfo->VHT_enable)
- network_type = WIRELESS_11AC;
- else if (pmlmeinfo->HT_enable)
+ if (pmlmeinfo->HT_enable)
network_type = WIRELESS_11_24N;
if (rtw_is_cckratesonly_included(rate))
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index fa275138c983..bfe0c3a773af 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -377,7 +377,6 @@ u32 ODM_Get_Rate_Bitmap(
break;
case (ODM_WM_G):
- case (ODM_WM_A):
if (rssi_level == DM_RATR_STA_HIGH)
rate_bitmap = 0x00000f00;
else
@@ -396,7 +395,6 @@ u32 ODM_Get_Rate_Bitmap(
case (ODM_WM_B|ODM_WM_G|ODM_WM_N24G):
case (ODM_WM_B|ODM_WM_N24G):
case (ODM_WM_G|ODM_WM_N24G):
- case (ODM_WM_A|ODM_WM_N5G):
if (pDM_Odm->RFType == ODM_1T2R || pDM_Odm->RFType == ODM_1T1R) {
if (rssi_level == DM_RATR_STA_HIGH)
rate_bitmap = 0x000f0000;
@@ -422,34 +420,6 @@ u32 ODM_Get_Rate_Bitmap(
}
break;
- case (ODM_WM_AC|ODM_WM_G):
- if (rssi_level == 1)
- rate_bitmap = 0xfc3f0000;
- else if (rssi_level == 2)
- rate_bitmap = 0xfffff000;
- else
- rate_bitmap = 0xffffffff;
- break;
-
- case (ODM_WM_AC|ODM_WM_A):
-
- if (pDM_Odm->RFType == RF_1T1R) {
- if (rssi_level == 1) /* add by Gary for ac-series */
- rate_bitmap = 0x003f8000;
- else if (rssi_level == 2)
- rate_bitmap = 0x003ff000;
- else
- rate_bitmap = 0x003ff010;
- } else {
- if (rssi_level == 1) /* add by Gary for ac-series */
- rate_bitmap = 0xfe3f8000; /* VHT 2SS MCS3~9 */
- else if (rssi_level == 2)
- rate_bitmap = 0xfffff000; /* VHT 2SS MCS0~9 */
- else
- rate_bitmap = 0xfffff010; /* All */
- }
- break;
-
default:
if (pDM_Odm->RFType == RF_1T2R)
rate_bitmap = 0x000fffff;
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index 950e7850bac2..7e2d3679c7d0 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -455,11 +455,8 @@ enum { /* tag_Wireless_Mode_Definition */
ODM_WM_UNKNOWN = 0x0,
ODM_WM_B = BIT0,
ODM_WM_G = BIT1,
- ODM_WM_A = BIT2,
ODM_WM_N24G = BIT3,
- ODM_WM_N5G = BIT4,
ODM_WM_AUTO = BIT5,
- ODM_WM_AC = BIT6,
};
/* ODM_CMNINFO_BAND */
diff --git a/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c b/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
index f3856e47bfd3..578d5712645c 100644
--- a/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
+++ b/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
@@ -124,12 +124,10 @@ void odm_EdcaTurboCheckCE(void *pDM_VOID)
} else if ((iot_peer == HT_IOT_PEER_CISCO) &&
((wirelessmode == ODM_WM_G) ||
(wirelessmode == (ODM_WM_B | ODM_WM_G)) ||
- (wirelessmode == ODM_WM_A) ||
(wirelessmode == ODM_WM_B))) {
EDCA_BE_DL = edca_setting_DL_GMode[iot_peer];
} else if ((iot_peer == HT_IOT_PEER_AIRGO) &&
- ((wirelessmode == ODM_WM_G) ||
- (wirelessmode == ODM_WM_A))) {
+ (wirelessmode == ODM_WM_G)) {
EDCA_BE_DL = 0xa630;
} else if (iot_peer == HT_IOT_PEER_MARVELL) {
EDCA_BE_DL = edca_setting_DL[iot_peer];
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 3738727feb60..a07a6dacec42 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -512,8 +512,6 @@ static void _InitOperationMode(struct adapter *padapter)
case WIRELESS_MODE_B:
regBwOpMode = BW_OPMODE_20MHZ;
break;
- case WIRELESS_MODE_A:
- break;
case WIRELESS_MODE_G:
regBwOpMode = BW_OPMODE_20MHZ;
break;
@@ -525,9 +523,6 @@ static void _InitOperationMode(struct adapter *padapter)
/* CCK rate will be filtered out only when associated AP does not support it. */
regBwOpMode = BW_OPMODE_20MHZ;
break;
- case WIRELESS_MODE_N_5G:
- regBwOpMode = BW_OPMODE_5G;
- break;
default: /* for MacOSX compiler warning. */
break;
diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h
index 19221289b8ce..6417d1b758d2 100644
--- a/drivers/staging/rtl8723bs/include/hal_phy.h
+++ b/drivers/staging/rtl8723bs/include/hal_phy.h
@@ -51,13 +51,10 @@ enum rf_path {
enum wireless_mode {
WIRELESS_MODE_UNKNOWN = 0x00,
- WIRELESS_MODE_A = 0x01,
WIRELESS_MODE_B = 0x02,
WIRELESS_MODE_G = 0x04,
WIRELESS_MODE_AUTO = 0x08,
WIRELESS_MODE_N_24G = 0x10,
- WIRELESS_MODE_N_5G = 0x20,
- WIRELESS_MODE_AC_5G = 0x40,
WIRELESS_MODE_AC_24G = 0x80,
WIRELESS_MODE_AC_ONLY = 0x100,
};
diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 6540c7a22938..ac88bd30b097 100644
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -144,33 +144,20 @@ enum network_type {
/* Sub-Element */
WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */
WIRELESS_11G = BIT(1), /* tx: ofdm only, rx: ofdm & cck, hw: cck & ofdm */
- WIRELESS_11A = BIT(2), /* tx: ofdm only, rx: ofdm only, hw: ofdm only */
WIRELESS_11_24N = BIT(3), /* tx: MCS only, rx: MCS & cck, hw: MCS & cck */
- WIRELESS_11_5N = BIT(4), /* tx: MCS only, rx: MCS & ofdm, hw: ofdm only */
WIRELESS_AUTO = BIT(5),
- WIRELESS_11AC = BIT(6),
/* Combination */
/* Type for current wireless mode */
WIRELESS_11BG = (WIRELESS_11B|WIRELESS_11G), /* tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm */
WIRELESS_11G_24N = (WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & MCS, rx: ofdm & cck & MCS, hw: cck & ofdm */
- WIRELESS_11A_5N = (WIRELESS_11A|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
WIRELESS_11B_24N = (WIRELESS_11B|WIRELESS_11_24N), /* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */
WIRELESS_11BG_24N = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */
- WIRELESS_11_24AC = (WIRELESS_11G|WIRELESS_11AC),
- WIRELESS_11_5AC = (WIRELESS_11A|WIRELESS_11AC),
-
-
- /* Type for registry default wireless mode */
- WIRELESS_11AGN = (WIRELESS_11A|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
- WIRELESS_11ABGN = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N),
- WIRELESS_MODE_24G = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11AC),
- WIRELESS_MODE_MAX = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N|WIRELESS_11AC),
};
#define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N)
-#define IsLegacyOnly(NetType) ((NetType) == ((NetType) & (WIRELESS_11BG|WIRELESS_11A)))
+#define IsLegacyOnly(NetType) ((NetType) == ((NetType) & (WIRELESS_11BG)))
#define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? true : false)
@@ -182,11 +169,8 @@ enum network_type {
#define IsSupportedRxHT(NetType) IsEnableHWOFDM(NetType)
#define IsSupportedTxCCK(NetType) (((NetType) & (WIRELESS_11B)) ? true : false)
-#define IsSupportedTxOFDM(NetType) (((NetType) & (WIRELESS_11G|WIRELESS_11A)) ? true : false)
-#define IsSupportedHT(NetType) (((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N)) ? true : false)
-
-#define IsSupportedVHT(NetType) (((NetType) & (WIRELESS_11AC)) ? true : false)
-
+#define IsSupportedTxOFDM(NetType) (((NetType) & (WIRELESS_11G) ? true : false)
+#define IsSupportedHT(NetType) (((NetType) & (WIRELESS_11_24N)) ? true : false)
struct ieee_param {
u32 cmd;
diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h
index 23de3ab87f9c..0bd7b662b972 100644
--- a/drivers/staging/rtl8723bs/include/wifi.h
+++ b/drivers/staging/rtl8723bs/include/wifi.h
@@ -336,7 +336,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
#define _PRE_ALLOCICVHDR_ 5
#define _PRE_ALLOCMICHDR_ 6
-#define _SIFSTIME_ ((priv->pmib->dot11BssType.net_work_type&WIRELESS_11A)?16:10)
#define _ACKCTSLNG_ 14 /* 14 bytes long, including crclng */
#define _CRCLNG_ 4
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 11b9a5919da4..4e7c115c8bc1 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -22,7 +22,7 @@ static int rtw_lbkmode;/* RTL8712_AIR_TRX; */
static int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure;infra, ad-hoc, auto */
/* struct ndis_802_11_ssid ssid; */
static int rtw_channel = 1;/* ad-hoc support requirement */
-static int rtw_wireless_mode = WIRELESS_MODE_MAX;
+static int rtw_wireless_mode = WIRELESS_11BG_24N;
static int rtw_vrtl_carrier_sense = AUTO_VCS;
static int rtw_vcs_type = RTS_CTS;/* */
static int rtw_rts_thresh = 2347;/* */
--
2.20.1
remove obsolete 5Ghz comments.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 --
drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 ----
2 files changed, 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 8514cfb3d7e0..427f0b88abd7 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -202,8 +202,6 @@ rtw_cfg80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
static int rtw_ieee80211_channel_to_frequency(int chan, int band)
{
- /* see 802.11 17.3.8.3.2 and Annex J
- * there are overlapping channel numbers in 5GHz and 2GHz bands */
if (band == NL80211_BAND_2GHZ) {
if (chan == 14)
return 2484;
diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
index 0084589499b9..5eef1d68c6f0 100644
--- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
+++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
@@ -44,10 +44,6 @@ static const struct ieee80211_regdomain rtw_regdom_rd = {
static int rtw_ieee80211_channel_to_frequency(int chan, int band)
{
- /* see 802.11 17.3.8.3.2 and Annex J
- * there are overlapping channel numbers in 5GHz and 2GHz bands
- */
-
/* NL80211_BAND_2GHZ */
if (chan == 14)
return 2484;
--
2.20.1
remove register initializations tied to 802.11ac standard which
is not supported by the device.
It's a dangerous operation, relying only on comments, but tested
on a Lenovo Ideapad MIIX 300-10IBY tablet seems to work.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 059d3050acc6..3a03dfb8d275 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1718,24 +1718,12 @@ void _InitBurstPktLen_8723BS(struct adapter *Adapter)
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
rtw_write8(Adapter, 0x4c7, rtw_read8(Adapter, 0x4c7)|BIT(7)); /* enable single pkt ampdu */
- rtw_write8(Adapter, REG_RX_PKT_LIMIT_8723B, 0x18); /* for VHT packet length 11K */
rtw_write8(Adapter, REG_MAX_AGGR_NUM_8723B, 0x1F);
rtw_write8(Adapter, REG_PIFS_8723B, 0x00);
rtw_write8(Adapter, REG_FWHW_TXQ_CTRL_8723B, rtw_read8(Adapter, REG_FWHW_TXQ_CTRL)&(~BIT(7)));
if (pHalData->AMPDUBurstMode)
rtw_write8(Adapter, REG_AMPDU_BURST_MODE_8723B, 0x5F);
rtw_write8(Adapter, REG_AMPDU_MAX_TIME_8723B, 0x70);
-
- /* ARFB table 9 for 11ac 5G 2SS */
- rtw_write32(Adapter, REG_ARFR0_8723B, 0x00000010);
- if (IS_NORMAL_CHIP(pHalData->VersionID))
- rtw_write32(Adapter, REG_ARFR0_8723B+4, 0xfffff000);
- else
- rtw_write32(Adapter, REG_ARFR0_8723B+4, 0x3e0ff000);
-
- /* ARFB table 10 for 11ac 5G 1SS */
- rtw_write32(Adapter, REG_ARFR1_8723B, 0x00000010);
- rtw_write32(Adapter, REG_ARFR1_8723B+4, 0x003ff000);
}
static void ResumeTxBeacon(struct adapter *padapter)
--
2.20.1
remove some unused 5Ghz macro definitions. Fix
comments accordingly.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/hal/odm.h | 1 -
drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h | 2 --
drivers/staging/rtl8723bs/include/hal_com_reg.h | 1 -
drivers/staging/rtl8723bs/include/hal_pg.h | 2 --
4 files changed, 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
index 788fc1c068b5..afb36de7a4e5 100644
--- a/drivers/staging/rtl8723bs/hal/odm.h
+++ b/drivers/staging/rtl8723bs/hal/odm.h
@@ -628,7 +628,6 @@ struct fat_t { /* _FAST_ANTENNA_TRAINNING_ */
u32 MinMaxRSSI;
u8 idx_AntDiv_counter_2G;
u8 idx_AntDiv_counter_5G;
- u32 AntDiv_2G_5G;
u32 CCK_counter_main;
u32 CCK_counter_aux;
u32 OFDM_counter_main;
diff --git a/drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h b/drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h
index 4b3a7c051630..aad962548278 100644
--- a/drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h
+++ b/drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h
@@ -558,7 +558,6 @@
#define b3WireRFPowerDown 0x1 /* Useless now */
/* define bHWSISelect 0x8 */
-#define b5GPAPEPolarity 0x40000000
#define b2GPAPEPolarity 0x80000000
#define bRFSW_TxDefaultAnt 0x3
#define bRFSW_TxOptionAnt 0x30
@@ -577,7 +576,6 @@
#define bRFSI_ANTSW 0x100
#define bRFSI_ANTSWB 0x200
#define bRFSI_PAPE 0x400
-#define bRFSI_PAPE5G 0x800
#define bBandSelect 0x1
#define bHTSIG2_GI 0x80
#define bHTSIG2_Smoothing 0x01
diff --git a/drivers/staging/rtl8723bs/include/hal_com_reg.h b/drivers/staging/rtl8723bs/include/hal_com_reg.h
index b14585cb0233..b2f179b48019 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_reg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_reg.h
@@ -717,7 +717,6 @@ Default: 00b.
/* BW_OPMODE bits (Offset 0x603, 8bit) */
/* */
#define BW_OPMODE_20MHZ BIT2
-#define BW_OPMODE_5G BIT1
/* */
/* CAM Config Setting (offset 0x680, 1 byte) */
diff --git a/drivers/staging/rtl8723bs/include/hal_pg.h b/drivers/staging/rtl8723bs/include/hal_pg.h
index 0b7a8adf5c74..2d8ccc9ddebb 100644
--- a/drivers/staging/rtl8723bs/include/hal_pg.h
+++ b/drivers/staging/rtl8723bs/include/hal_pg.h
@@ -16,10 +16,8 @@
/* For VHT series TX power by rate table. */
/* VHT TX power by rate off setArray = */
-/* Band:-2G&5G = 0 / 1 */
/* RF: at most 4*4 = ABCD = 0/1/2/3 */
/* CCK = 0 OFDM = 1/2 HT-MCS 0-15 =3/4/56 VHT =7/8/9/10/11 */
-#define TX_PWR_BY_RATE_NUM_BAND 2
#define TX_PWR_BY_RATE_NUM_RF 4
#define TX_PWR_BY_RATE_NUM_RATE 84
#define MAX_RF_PATH_NUM 2
--
2.20.1
remove item related to 5Ghz code deletion from
driver's TODO list.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/TODO | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/rtl8723bs/TODO b/drivers/staging/rtl8723bs/TODO
index afa620ceb2d8..3d8f5a634a10 100644
--- a/drivers/staging/rtl8723bs/TODO
+++ b/drivers/staging/rtl8723bs/TODO
@@ -1,6 +1,4 @@
TODO:
-- find and remove remaining code valid only for 5 GHz. Most of the obvious
- ones have been removed, but things like channel > 14 still exist.
- find and remove any code for other chips that is left over
- convert any remaining unusual variable types
- find codes that can use %pM and %Nph formatting
--
2.20.1
fix check allowing 5Ghz settings, only disabled and
2.4Ghz enabled states are allowed. Fix comment
accordingly.
Signed-off-by: Fabio Aiuto <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index afefc2c8a2ac..e73fb13f8968 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -2572,10 +2572,9 @@ static int rtw_dbg_port(struct net_device *dev,
case 0x12: /* set rx_stbc */
{
struct registry_priv *pregpriv = &padapter->registrypriv;
- /* 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, 0x3: enable both 2.4g and 5g */
- /* default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ */
- if (extra_arg == 0 || extra_arg == 1 ||
- extra_arg == 2 || extra_arg == 3)
+ /* 0: disable, bit(0):enable 2.4g */
+ /* default is set to enable 2.4GHZ */
+ if (extra_arg == 0 || extra_arg == 1)
pregpriv->rx_stbc = extra_arg;
}
break;
--
2.20.1
Hi,
Thank you for your work in this.
On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> remove all 5Ghz network types. rtl8723bs works on
> 802.11bgn standards and on 2.4Ghz band.
>
> So remove all code related to 802.11a and 802.11ac
> standards, which the device doesn't support.
>
> Signed-off-by: Fabio Aiuto <[email protected]>
> ---
> drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +---
> .../staging/rtl8723bs/core/rtw_ieee80211.c | 22 ++------
> drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ----
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 55 -------------------
> .../staging/rtl8723bs/core/rtw_wlan_util.c | 14 +----
> drivers/staging/rtl8723bs/hal/odm.c | 30 ----------
> drivers/staging/rtl8723bs/hal/odm.h | 3 -
> .../rtl8723bs/hal/odm_EdcaTurboCheck.c | 4 +-
> drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 --
> drivers/staging/rtl8723bs/include/hal_phy.h | 3 -
> drivers/staging/rtl8723bs/include/ieee80211.h | 22 +-------
> drivers/staging/rtl8723bs/include/wifi.h | 1 -
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
> 13 files changed, 14 insertions(+), 167 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
> index 23bbdf084631..b0abadd4b4dd 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ap.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
> @@ -343,10 +343,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
>
> if (pcur_network->Configuration.DSConfig > 14) {
This if sounds like it is checking for a channel-nr greater
then 14, so maybe this entire block should go away ?
> if (tx_ra_bitmap & 0xffff000)
> - sta_band |= WIRELESS_11_5N;
> -
> - if (tx_ra_bitmap & 0xff0)
> - sta_band |= WIRELESS_11A;
> + sta_band |= WIRELESS_INVALID;
You are replacing 2 if-s with 1 here, so you should also or
the 2 masks being checked for togehter, iow there now should
be one if like this:
if (tx_ra_bitmap & (0xffff000 | 0xff0))
sta_band |= WIRELESS_INVALID;
Which can be simplified to:
if (tx_ra_bitmap & 0xffffff0)
sta_band |= WIRELESS_INVALID;
The rest of the patch looks ok (from a quick scan).
Regards,
Hans
> } else {
> if (tx_ra_bitmap & 0xffff000)
> sta_band |= WIRELESS_11_24N;
> @@ -412,7 +409,7 @@ void update_bmc_sta(struct adapter *padapter)
> } else if (network_type == WIRELESS_INVALID) { /* error handling */
>
> if (pcur_network->Configuration.DSConfig > 14)
> - network_type = WIRELESS_11A;
> + network_type = WIRELESS_INVALID;
> else
> network_type = WIRELESS_11B;
> }
> @@ -1115,9 +1112,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
> case WIRELESS_11BG_24N:
> pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
> break;
> - case WIRELESS_11A:
> - pbss_network->NetworkTypeInUse = Ndis802_11OFDM5;
> - break;
> default:
> pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
> break;
> diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> index e341789954b9..0f0fcd9dc652 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> @@ -96,10 +96,7 @@ bool rtw_is_cckratesonly_included(u8 *rate)
> int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)
> {
> if (channel > 14) {
> - if (rtw_is_cckrates_included(rate))
> - return WIRELESS_INVALID;
> - else
> - return WIRELESS_11A;
> + return WIRELESS_INVALID;
> } else { /* could be pure B, pure G, or B/G */
> if (rtw_is_cckratesonly_included(rate))
> return WIRELESS_11B;
> @@ -266,10 +263,6 @@ void rtw_set_supported_rate(u8 *SupportedRates, uint mode)
> break;
>
> case WIRELESS_11G:
> - case WIRELESS_11A:
> - case WIRELESS_11_5N:
> - case WIRELESS_11A_5N:/* Todo: no basic rate for ofdm ? */
> - case WIRELESS_11_5AC:
> memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
> break;
>
> @@ -327,14 +320,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
> ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz);
>
> /* supported rates */
> - if (pregistrypriv->wireless_mode == WIRELESS_11ABGN) {
> - if (pdev_network->Configuration.DSConfig > 14)
> - wireless_mode = WIRELESS_11A_5N;
> - else
> - wireless_mode = WIRELESS_11BG_24N;
> - } else {
> - wireless_mode = pregistrypriv->wireless_mode;
> - }
> + wireless_mode = pregistrypriv->wireless_mode;
>
> rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
>
> @@ -359,8 +345,8 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
> }
>
> /* HT Cap. */
> - if (((pregistrypriv->wireless_mode&WIRELESS_11_5N) || (pregistrypriv->wireless_mode&WIRELESS_11_24N))
> - && (pregistrypriv->ht_enable == true)) {
> + if ((pregistrypriv->wireless_mode & WIRELESS_11_24N) &&
> + (pregistrypriv->ht_enable == true)) {
> /* todo: */
> }
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> index 158f92d4d882..2dd75e007239 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> @@ -2184,16 +2184,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
> case WIRELESS_11BG_24N:
> pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
> break;
> - case WIRELESS_11A:
> - case WIRELESS_11A_5N:
> - pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
> - break;
> - case WIRELESS_11ABGN:
> - if (pregistrypriv->channel > 14)
> - pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
> - else
> - pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
> - break;
> default:
> /* TODO */
> break;
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index 4df3cba97f42..106779fb9fef 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -4478,61 +4478,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
> }
> }
>
> - if (pregistrypriv->wireless_mode & WIRELESS_11A) {
> - do {
> - if ((i == MAX_CHANNEL_NUM) ||
> - (chplan_sta[i].ChannelNum == 0))
> - break;
> -
> - if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] == 0))
> - break;
> -
> - if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) {
> - chplan_new[k].ChannelNum = chplan_ap.Channel[j];
> - chplan_new[k].ScanType = SCAN_ACTIVE;
> - i++;
> - j++;
> - k++;
> - } else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) {
> - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
> -/* chplan_new[k].ScanType = chplan_sta[i].ScanType; */
> - chplan_new[k].ScanType = SCAN_PASSIVE;
> - i++;
> - k++;
> - } else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) {
> - chplan_new[k].ChannelNum = chplan_ap.Channel[j];
> - chplan_new[k].ScanType = SCAN_ACTIVE;
> - j++;
> - k++;
> - }
> - } while (1);
> -
> - /* change AP not support channel to Passive scan */
> - while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
> - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
> -/* chplan_new[k].ScanType = chplan_sta[i].ScanType; */
> - chplan_new[k].ScanType = SCAN_PASSIVE;
> - i++;
> - k++;
> - }
> -
> - /* add channel AP supported */
> - while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] != 0)) {
> - chplan_new[k].ChannelNum = chplan_ap.Channel[j];
> - chplan_new[k].ScanType = SCAN_ACTIVE;
> - j++;
> - k++;
> - }
> - } else {
> - /* keep original STA 5G channel plan */
> - while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
> - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
> - chplan_new[k].ScanType = chplan_sta[i].ScanType;
> - i++;
> - k++;
> - }
> - }
> -
> pmlmeext->update_channel_plan_by_ap_done = 1;
> }
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> index afabb9d48021..2a47d678de01 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> @@ -55,9 +55,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
>
> if (cur_rf_type == RF_1T1R) {
> rf_type = RF_1T1R;
> - } else if (IsSupportedVHT(psta->wireless_mode)) {
> - if (psta->ra_mask & 0xffc00000)
> - rf_type = RF_2T2R;
> } else if (IsSupportedHT(psta->wireless_mode)) {
> if (psta->ra_mask & 0xfff00000)
> rf_type = RF_2T2R;
> @@ -67,7 +64,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
> case WIRELESS_11B:
> raid = RATEID_IDX_B;
> break;
> - case WIRELESS_11A:
> case WIRELESS_11G:
> raid = RATEID_IDX_G;
> break;
> @@ -75,8 +71,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
> raid = RATEID_IDX_BG;
> break;
> case WIRELESS_11_24N:
> - case WIRELESS_11_5N:
> - case WIRELESS_11A_5N:
> case WIRELESS_11G_24N:
> if (rf_type == RF_2T2R)
> raid = RATEID_IDX_GN_N2SS;
> @@ -827,7 +821,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
>
> AIFS = aSifsTime + (2 * pmlmeinfo->slotTime);
>
> - if (pmlmeext->cur_wireless_mode & (WIRELESS_11G | WIRELESS_11A)) {
> + if (pmlmeext->cur_wireless_mode & WIRELESS_11G) {
> ECWMin = 4;
> ECWMax = 10;
> } else if (pmlmeext->cur_wireless_mode & WIRELESS_11B) {
> @@ -1623,7 +1617,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
> pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
> } else {
> /* Filen: See 802.11-2007 p.90 */
> - if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N | WIRELESS_11A | WIRELESS_11_5N | WIRELESS_11AC)) {
> + if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N)) {
> pmlmeinfo->slotTime = SHORT_SLOT_TIME;
> } else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G)) {
> if ((updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */)
> @@ -1653,9 +1647,7 @@ void update_wireless_mode(struct adapter *padapter)
> if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
> pmlmeinfo->HT_enable = 1;
>
> - if (pmlmeinfo->VHT_enable)
> - network_type = WIRELESS_11AC;
> - else if (pmlmeinfo->HT_enable)
> + if (pmlmeinfo->HT_enable)
> network_type = WIRELESS_11_24N;
>
> if (rtw_is_cckratesonly_included(rate))
> diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
> index fa275138c983..bfe0c3a773af 100644
> --- a/drivers/staging/rtl8723bs/hal/odm.c
> +++ b/drivers/staging/rtl8723bs/hal/odm.c
> @@ -377,7 +377,6 @@ u32 ODM_Get_Rate_Bitmap(
> break;
>
> case (ODM_WM_G):
> - case (ODM_WM_A):
> if (rssi_level == DM_RATR_STA_HIGH)
> rate_bitmap = 0x00000f00;
> else
> @@ -396,7 +395,6 @@ u32 ODM_Get_Rate_Bitmap(
> case (ODM_WM_B|ODM_WM_G|ODM_WM_N24G):
> case (ODM_WM_B|ODM_WM_N24G):
> case (ODM_WM_G|ODM_WM_N24G):
> - case (ODM_WM_A|ODM_WM_N5G):
> if (pDM_Odm->RFType == ODM_1T2R || pDM_Odm->RFType == ODM_1T1R) {
> if (rssi_level == DM_RATR_STA_HIGH)
> rate_bitmap = 0x000f0000;
> @@ -422,34 +420,6 @@ u32 ODM_Get_Rate_Bitmap(
> }
> break;
>
> - case (ODM_WM_AC|ODM_WM_G):
> - if (rssi_level == 1)
> - rate_bitmap = 0xfc3f0000;
> - else if (rssi_level == 2)
> - rate_bitmap = 0xfffff000;
> - else
> - rate_bitmap = 0xffffffff;
> - break;
> -
> - case (ODM_WM_AC|ODM_WM_A):
> -
> - if (pDM_Odm->RFType == RF_1T1R) {
> - if (rssi_level == 1) /* add by Gary for ac-series */
> - rate_bitmap = 0x003f8000;
> - else if (rssi_level == 2)
> - rate_bitmap = 0x003ff000;
> - else
> - rate_bitmap = 0x003ff010;
> - } else {
> - if (rssi_level == 1) /* add by Gary for ac-series */
> - rate_bitmap = 0xfe3f8000; /* VHT 2SS MCS3~9 */
> - else if (rssi_level == 2)
> - rate_bitmap = 0xfffff000; /* VHT 2SS MCS0~9 */
> - else
> - rate_bitmap = 0xfffff010; /* All */
> - }
> - break;
> -
> default:
> if (pDM_Odm->RFType == RF_1T2R)
> rate_bitmap = 0x000fffff;
> diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
> index 950e7850bac2..7e2d3679c7d0 100644
> --- a/drivers/staging/rtl8723bs/hal/odm.h
> +++ b/drivers/staging/rtl8723bs/hal/odm.h
> @@ -455,11 +455,8 @@ enum { /* tag_Wireless_Mode_Definition */
> ODM_WM_UNKNOWN = 0x0,
> ODM_WM_B = BIT0,
> ODM_WM_G = BIT1,
> - ODM_WM_A = BIT2,
> ODM_WM_N24G = BIT3,
> - ODM_WM_N5G = BIT4,
> ODM_WM_AUTO = BIT5,
> - ODM_WM_AC = BIT6,
> };
>
> /* ODM_CMNINFO_BAND */
> diff --git a/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c b/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
> index f3856e47bfd3..578d5712645c 100644
> --- a/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
> +++ b/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
> @@ -124,12 +124,10 @@ void odm_EdcaTurboCheckCE(void *pDM_VOID)
> } else if ((iot_peer == HT_IOT_PEER_CISCO) &&
> ((wirelessmode == ODM_WM_G) ||
> (wirelessmode == (ODM_WM_B | ODM_WM_G)) ||
> - (wirelessmode == ODM_WM_A) ||
> (wirelessmode == ODM_WM_B))) {
> EDCA_BE_DL = edca_setting_DL_GMode[iot_peer];
> } else if ((iot_peer == HT_IOT_PEER_AIRGO) &&
> - ((wirelessmode == ODM_WM_G) ||
> - (wirelessmode == ODM_WM_A))) {
> + (wirelessmode == ODM_WM_G)) {
> EDCA_BE_DL = 0xa630;
> } else if (iot_peer == HT_IOT_PEER_MARVELL) {
> EDCA_BE_DL = edca_setting_DL[iot_peer];
> diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
> index 3738727feb60..a07a6dacec42 100644
> --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
> +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
> @@ -512,8 +512,6 @@ static void _InitOperationMode(struct adapter *padapter)
> case WIRELESS_MODE_B:
> regBwOpMode = BW_OPMODE_20MHZ;
> break;
> - case WIRELESS_MODE_A:
> - break;
> case WIRELESS_MODE_G:
> regBwOpMode = BW_OPMODE_20MHZ;
> break;
> @@ -525,9 +523,6 @@ static void _InitOperationMode(struct adapter *padapter)
> /* CCK rate will be filtered out only when associated AP does not support it. */
> regBwOpMode = BW_OPMODE_20MHZ;
> break;
> - case WIRELESS_MODE_N_5G:
> - regBwOpMode = BW_OPMODE_5G;
> - break;
>
> default: /* for MacOSX compiler warning. */
> break;
> diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h
> index 19221289b8ce..6417d1b758d2 100644
> --- a/drivers/staging/rtl8723bs/include/hal_phy.h
> +++ b/drivers/staging/rtl8723bs/include/hal_phy.h
> @@ -51,13 +51,10 @@ enum rf_path {
>
> enum wireless_mode {
> WIRELESS_MODE_UNKNOWN = 0x00,
> - WIRELESS_MODE_A = 0x01,
> WIRELESS_MODE_B = 0x02,
> WIRELESS_MODE_G = 0x04,
> WIRELESS_MODE_AUTO = 0x08,
> WIRELESS_MODE_N_24G = 0x10,
> - WIRELESS_MODE_N_5G = 0x20,
> - WIRELESS_MODE_AC_5G = 0x40,
> WIRELESS_MODE_AC_24G = 0x80,
> WIRELESS_MODE_AC_ONLY = 0x100,
> };
> diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
> index 6540c7a22938..ac88bd30b097 100644
> --- a/drivers/staging/rtl8723bs/include/ieee80211.h
> +++ b/drivers/staging/rtl8723bs/include/ieee80211.h
> @@ -144,33 +144,20 @@ enum network_type {
> /* Sub-Element */
> WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */
> WIRELESS_11G = BIT(1), /* tx: ofdm only, rx: ofdm & cck, hw: cck & ofdm */
> - WIRELESS_11A = BIT(2), /* tx: ofdm only, rx: ofdm only, hw: ofdm only */
> WIRELESS_11_24N = BIT(3), /* tx: MCS only, rx: MCS & cck, hw: MCS & cck */
> - WIRELESS_11_5N = BIT(4), /* tx: MCS only, rx: MCS & ofdm, hw: ofdm only */
> WIRELESS_AUTO = BIT(5),
> - WIRELESS_11AC = BIT(6),
>
> /* Combination */
> /* Type for current wireless mode */
> WIRELESS_11BG = (WIRELESS_11B|WIRELESS_11G), /* tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm */
> WIRELESS_11G_24N = (WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & MCS, rx: ofdm & cck & MCS, hw: cck & ofdm */
> - WIRELESS_11A_5N = (WIRELESS_11A|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
> WIRELESS_11B_24N = (WIRELESS_11B|WIRELESS_11_24N), /* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */
> WIRELESS_11BG_24N = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */
> - WIRELESS_11_24AC = (WIRELESS_11G|WIRELESS_11AC),
> - WIRELESS_11_5AC = (WIRELESS_11A|WIRELESS_11AC),
> -
> -
> - /* Type for registry default wireless mode */
> - WIRELESS_11AGN = (WIRELESS_11A|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
> - WIRELESS_11ABGN = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N),
> - WIRELESS_MODE_24G = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11AC),
> - WIRELESS_MODE_MAX = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N|WIRELESS_11AC),
> };
>
> #define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N)
>
> -#define IsLegacyOnly(NetType) ((NetType) == ((NetType) & (WIRELESS_11BG|WIRELESS_11A)))
> +#define IsLegacyOnly(NetType) ((NetType) == ((NetType) & (WIRELESS_11BG)))
>
> #define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? true : false)
>
> @@ -182,11 +169,8 @@ enum network_type {
> #define IsSupportedRxHT(NetType) IsEnableHWOFDM(NetType)
>
> #define IsSupportedTxCCK(NetType) (((NetType) & (WIRELESS_11B)) ? true : false)
> -#define IsSupportedTxOFDM(NetType) (((NetType) & (WIRELESS_11G|WIRELESS_11A)) ? true : false)
> -#define IsSupportedHT(NetType) (((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N)) ? true : false)
> -
> -#define IsSupportedVHT(NetType) (((NetType) & (WIRELESS_11AC)) ? true : false)
> -
> +#define IsSupportedTxOFDM(NetType) (((NetType) & (WIRELESS_11G) ? true : false)
> +#define IsSupportedHT(NetType) (((NetType) & (WIRELESS_11_24N)) ? true : false)
>
> struct ieee_param {
> u32 cmd;
> diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h
> index 23de3ab87f9c..0bd7b662b972 100644
> --- a/drivers/staging/rtl8723bs/include/wifi.h
> +++ b/drivers/staging/rtl8723bs/include/wifi.h
> @@ -336,7 +336,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
> #define _PRE_ALLOCICVHDR_ 5
> #define _PRE_ALLOCMICHDR_ 6
>
> -#define _SIFSTIME_ ((priv->pmib->dot11BssType.net_work_type&WIRELESS_11A)?16:10)
> #define _ACKCTSLNG_ 14 /* 14 bytes long, including crclng */
> #define _CRCLNG_ 4
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 11b9a5919da4..4e7c115c8bc1 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -22,7 +22,7 @@ static int rtw_lbkmode;/* RTL8712_AIR_TRX; */
> static int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure;infra, ad-hoc, auto */
> /* struct ndis_802_11_ssid ssid; */
> static int rtw_channel = 1;/* ad-hoc support requirement */
> -static int rtw_wireless_mode = WIRELESS_MODE_MAX;
> +static int rtw_wireless_mode = WIRELESS_11BG_24N;
> static int rtw_vrtl_carrier_sense = AUTO_VCS;
> static int rtw_vcs_type = RTS_CTS;/* */
> static int rtw_rts_thresh = 2347;/* */
>
Hi,
On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> remove VHT dead code, as the device doesn't support
> VHT (which is a 802.11ac capability).
>
> Signed-off-by: Fabio Aiuto <[email protected]>
> ---
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
> drivers/staging/rtl8723bs/hal/hal_com.c | 241 -----------
> .../staging/rtl8723bs/hal/hal_com_phycfg.c | 383 +-----------------
> drivers/staging/rtl8723bs/include/hal_com.h | 62 +--
> .../rtl8723bs/include/hal_com_phycfg.h | 4 -
> drivers/staging/rtl8723bs/include/ieee80211.h | 45 --
> .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
> drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
> 8 files changed, 9 insertions(+), 752 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> index 285acd3d843b..c128d462c6c7 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> @@ -46,7 +46,6 @@ static struct action_handler OnAction_tbl[] = {
> {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved},
> {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved},
> {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved},
> - {RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &DoReserved},
> {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved},
> };
>
> diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
> index 7a88447f8294..eebd48438733 100644
> --- a/drivers/staging/rtl8723bs/hal/hal_com.c
> +++ b/drivers/staging/rtl8723bs/hal/hal_com.c
> @@ -295,126 +295,6 @@ u8 MRateToHwRate(u8 rate)
> case MGN_MCS31:
> ret = DESC_RATEMCS31;
> break;
> - case MGN_VHT1SS_MCS0:
> - ret = DESC_RATEVHTSS1MCS0;
> - break;
> - case MGN_VHT1SS_MCS1:
> - ret = DESC_RATEVHTSS1MCS1;
> - break;
> - case MGN_VHT1SS_MCS2:
> - ret = DESC_RATEVHTSS1MCS2;
> - break;
> - case MGN_VHT1SS_MCS3:
> - ret = DESC_RATEVHTSS1MCS3;
> - break;
> - case MGN_VHT1SS_MCS4:
> - ret = DESC_RATEVHTSS1MCS4;
> - break;
> - case MGN_VHT1SS_MCS5:
> - ret = DESC_RATEVHTSS1MCS5;
> - break;
> - case MGN_VHT1SS_MCS6:
> - ret = DESC_RATEVHTSS1MCS6;
> - break;
> - case MGN_VHT1SS_MCS7:
> - ret = DESC_RATEVHTSS1MCS7;
> - break;
> - case MGN_VHT1SS_MCS8:
> - ret = DESC_RATEVHTSS1MCS8;
> - break;
> - case MGN_VHT1SS_MCS9:
> - ret = DESC_RATEVHTSS1MCS9;
> - break;
> - case MGN_VHT2SS_MCS0:
> - ret = DESC_RATEVHTSS2MCS0;
> - break;
> - case MGN_VHT2SS_MCS1:
> - ret = DESC_RATEVHTSS2MCS1;
> - break;
> - case MGN_VHT2SS_MCS2:
> - ret = DESC_RATEVHTSS2MCS2;
> - break;
> - case MGN_VHT2SS_MCS3:
> - ret = DESC_RATEVHTSS2MCS3;
> - break;
> - case MGN_VHT2SS_MCS4:
> - ret = DESC_RATEVHTSS2MCS4;
> - break;
> - case MGN_VHT2SS_MCS5:
> - ret = DESC_RATEVHTSS2MCS5;
> - break;
> - case MGN_VHT2SS_MCS6:
> - ret = DESC_RATEVHTSS2MCS6;
> - break;
> - case MGN_VHT2SS_MCS7:
> - ret = DESC_RATEVHTSS2MCS7;
> - break;
> - case MGN_VHT2SS_MCS8:
> - ret = DESC_RATEVHTSS2MCS8;
> - break;
> - case MGN_VHT2SS_MCS9:
> - ret = DESC_RATEVHTSS2MCS9;
> - break;
> - case MGN_VHT3SS_MCS0:
> - ret = DESC_RATEVHTSS3MCS0;
> - break;
> - case MGN_VHT3SS_MCS1:
> - ret = DESC_RATEVHTSS3MCS1;
> - break;
> - case MGN_VHT3SS_MCS2:
> - ret = DESC_RATEVHTSS3MCS2;
> - break;
> - case MGN_VHT3SS_MCS3:
> - ret = DESC_RATEVHTSS3MCS3;
> - break;
> - case MGN_VHT3SS_MCS4:
> - ret = DESC_RATEVHTSS3MCS4;
> - break;
> - case MGN_VHT3SS_MCS5:
> - ret = DESC_RATEVHTSS3MCS5;
> - break;
> - case MGN_VHT3SS_MCS6:
> - ret = DESC_RATEVHTSS3MCS6;
> - break;
> - case MGN_VHT3SS_MCS7:
> - ret = DESC_RATEVHTSS3MCS7;
> - break;
> - case MGN_VHT3SS_MCS8:
> - ret = DESC_RATEVHTSS3MCS8;
> - break;
> - case MGN_VHT3SS_MCS9:
> - ret = DESC_RATEVHTSS3MCS9;
> - break;
> - case MGN_VHT4SS_MCS0:
> - ret = DESC_RATEVHTSS4MCS0;
> - break;
> - case MGN_VHT4SS_MCS1:
> - ret = DESC_RATEVHTSS4MCS1;
> - break;
> - case MGN_VHT4SS_MCS2:
> - ret = DESC_RATEVHTSS4MCS2;
> - break;
> - case MGN_VHT4SS_MCS3:
> - ret = DESC_RATEVHTSS4MCS3;
> - break;
> - case MGN_VHT4SS_MCS4:
> - ret = DESC_RATEVHTSS4MCS4;
> - break;
> - case MGN_VHT4SS_MCS5:
> - ret = DESC_RATEVHTSS4MCS5;
> - break;
> - case MGN_VHT4SS_MCS6:
> - ret = DESC_RATEVHTSS4MCS6;
> - break;
> - case MGN_VHT4SS_MCS7:
> - ret = DESC_RATEVHTSS4MCS7;
> - break;
> - case MGN_VHT4SS_MCS8:
> - ret = DESC_RATEVHTSS4MCS8;
> - break;
> - case MGN_VHT4SS_MCS9:
> - ret = DESC_RATEVHTSS4MCS9;
> - break;
> default:
> break;
> }
> @@ -559,127 +439,6 @@ u8 HwRateToMRate(u8 rate)
> case DESC_RATEMCS31:
> ret_rate = MGN_MCS31;
> break;
> - case DESC_RATEVHTSS1MCS0:
> - ret_rate = MGN_VHT1SS_MCS0;
> - break;
> - case DESC_RATEVHTSS1MCS1:
> - ret_rate = MGN_VHT1SS_MCS1;
> - break;
> - case DESC_RATEVHTSS1MCS2:
> - ret_rate = MGN_VHT1SS_MCS2;
> - break;
> - case DESC_RATEVHTSS1MCS3:
> - ret_rate = MGN_VHT1SS_MCS3;
> - break;
> - case DESC_RATEVHTSS1MCS4:
> - ret_rate = MGN_VHT1SS_MCS4;
> - break;
> - case DESC_RATEVHTSS1MCS5:
> - ret_rate = MGN_VHT1SS_MCS5;
> - break;
> - case DESC_RATEVHTSS1MCS6:
> - ret_rate = MGN_VHT1SS_MCS6;
> - break;
> - case DESC_RATEVHTSS1MCS7:
> - ret_rate = MGN_VHT1SS_MCS7;
> - break;
> - case DESC_RATEVHTSS1MCS8:
> - ret_rate = MGN_VHT1SS_MCS8;
> - break;
> - case DESC_RATEVHTSS1MCS9:
> - ret_rate = MGN_VHT1SS_MCS9;
> - break;
> - case DESC_RATEVHTSS2MCS0:
> - ret_rate = MGN_VHT2SS_MCS0;
> - break;
> - case DESC_RATEVHTSS2MCS1:
> - ret_rate = MGN_VHT2SS_MCS1;
> - break;
> - case DESC_RATEVHTSS2MCS2:
> - ret_rate = MGN_VHT2SS_MCS2;
> - break;
> - case DESC_RATEVHTSS2MCS3:
> - ret_rate = MGN_VHT2SS_MCS3;
> - break;
> - case DESC_RATEVHTSS2MCS4:
> - ret_rate = MGN_VHT2SS_MCS4;
> - break;
> - case DESC_RATEVHTSS2MCS5:
> - ret_rate = MGN_VHT2SS_MCS5;
> - break;
> - case DESC_RATEVHTSS2MCS6:
> - ret_rate = MGN_VHT2SS_MCS6;
> - break;
> - case DESC_RATEVHTSS2MCS7:
> - ret_rate = MGN_VHT2SS_MCS7;
> - break;
> - case DESC_RATEVHTSS2MCS8:
> - ret_rate = MGN_VHT2SS_MCS8;
> - break;
> - case DESC_RATEVHTSS2MCS9:
> - ret_rate = MGN_VHT2SS_MCS9;
> - break;
> - case DESC_RATEVHTSS3MCS0:
> - ret_rate = MGN_VHT3SS_MCS0;
> - break;
> - case DESC_RATEVHTSS3MCS1:
> - ret_rate = MGN_VHT3SS_MCS1;
> - break;
> - case DESC_RATEVHTSS3MCS2:
> - ret_rate = MGN_VHT3SS_MCS2;
> - break;
> - case DESC_RATEVHTSS3MCS3:
> - ret_rate = MGN_VHT3SS_MCS3;
> - break;
> - case DESC_RATEVHTSS3MCS4:
> - ret_rate = MGN_VHT3SS_MCS4;
> - break;
> - case DESC_RATEVHTSS3MCS5:
> - ret_rate = MGN_VHT3SS_MCS5;
> - break;
> - case DESC_RATEVHTSS3MCS6:
> - ret_rate = MGN_VHT3SS_MCS6;
> - break;
> - case DESC_RATEVHTSS3MCS7:
> - ret_rate = MGN_VHT3SS_MCS7;
> - break;
> - case DESC_RATEVHTSS3MCS8:
> - ret_rate = MGN_VHT3SS_MCS8;
> - break;
> - case DESC_RATEVHTSS3MCS9:
> - ret_rate = MGN_VHT3SS_MCS9;
> - break;
> - case DESC_RATEVHTSS4MCS0:
> - ret_rate = MGN_VHT4SS_MCS0;
> - break;
> - case DESC_RATEVHTSS4MCS1:
> - ret_rate = MGN_VHT4SS_MCS1;
> - break;
> - case DESC_RATEVHTSS4MCS2:
> - ret_rate = MGN_VHT4SS_MCS2;
> - break;
> - case DESC_RATEVHTSS4MCS3:
> - ret_rate = MGN_VHT4SS_MCS3;
> - break;
> - case DESC_RATEVHTSS4MCS4:
> - ret_rate = MGN_VHT4SS_MCS4;
> - break;
> - case DESC_RATEVHTSS4MCS5:
> - ret_rate = MGN_VHT4SS_MCS5;
> - break;
> - case DESC_RATEVHTSS4MCS6:
> - ret_rate = MGN_VHT4SS_MCS6;
> - break;
> - case DESC_RATEVHTSS4MCS7:
> - ret_rate = MGN_VHT4SS_MCS7;
> - break;
> - case DESC_RATEVHTSS4MCS8:
> - ret_rate = MGN_VHT4SS_MCS8;
> - break;
> - case DESC_RATEVHTSS4MCS9:
> - ret_rate = MGN_VHT4SS_MCS9;
> - break;
> -
> default:
> break;
> }
> diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> index 395eb3b5af71..bb7941aee0c4 100644
> --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> @@ -39,18 +39,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
> case HT_MCS24_MCS31:
> value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
> break;
> - case VHT_1SSMCS0_1SSMCS9:
> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
> - break;
> - case VHT_2SSMCS0_2SSMCS9:
> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
> - break;
> - case VHT_3SSMCS0_3SSMCS9:
> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
> - break;
> - case VHT_4SSMCS0_4SSMCS9:
> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
> - break;
> default:
> break;
> }
> @@ -91,18 +79,6 @@ phy_SetTxPowerByRateBase(
> case HT_MCS24_MCS31:
> pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
> break;
> - case VHT_1SSMCS0_1SSMCS9:
> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
> - break;
> - case VHT_2SSMCS0_2SSMCS9:
> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
> - break;
> - case VHT_3SSMCS0_3SSMCS9:
> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
> - break;
> - case VHT_4SSMCS0_4SSMCS9:
> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
> - break;
> default:
> break;
> }
> @@ -131,14 +107,6 @@ struct adapter *padapter
> base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
> phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
>
> - base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
> - phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
> -
> - base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
> - phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
> -
> - base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
> - phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
You are removing a bunch of register writes from a block here, while keeping others,
so this does not seem like it is just dead-code removal it feels like you are
actually making a functional change.
Perhaps this entire block can never be executed ?
Or maybe the VHT name used here is misleading and this is also relevant for 2.4 GHZ
40Mhz use ? Did you test with an access point configured to use 40 MHz channels
and then checked that you were actually using a 40MHz channel ? Note these are
quite rare AFAIK because 40 MHz tends to cause even more collosion issues in the
already quite full 2.4G spectrum, still if possible you should test this and make
sure that it does not regress (with out specifically testing this we might not
note regressions for a long time because of 40MHz usage being rare).
> }
> }
>
> @@ -442,81 +410,6 @@ PHY_GetRateValuesOfTxPowerByRate(
> *RateNum = 4;
> break;
>
> - case 0xC3C:
> - case 0xE3C:
> - case 0x183C:
> - case 0x1a3C:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS0);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS1);
> - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS2);
> - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS3);
> - for (i = 0; i < 4; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
> - case 0xC40:
> - case 0xE40:
> - case 0x1840:
> - case 0x1a40:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS4);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS5);
> - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS6);
> - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS7);
> - for (i = 0; i < 4; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
> - case 0xC44:
> - case 0xE44:
> - case 0x1844:
> - case 0x1a44:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS8);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS9);
> - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0);
> - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1);
> - for (i = 0; i < 4; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
> - case 0xC48:
> - case 0xE48:
> - case 0x1848:
> - case 0x1a48:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS2);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS3);
> - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS4);
> - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS5);
> - for (i = 0; i < 4; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
> - case 0xC4C:
> - case 0xE4C:
> - case 0x184C:
> - case 0x1a4C:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS6);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS7);
> - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS8);
> - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS9);
> - for (i = 0; i < 4; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
> case 0xCD8:
> case 0xED8:
> case 0x18D8:
> @@ -547,49 +440,6 @@ PHY_GetRateValuesOfTxPowerByRate(
> *RateNum = 4;
> break;
>
> - case 0xCE0:
> - case 0xEE0:
> - case 0x18E0:
> - case 0x1aE0:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS0);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS1);
> - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS2);
> - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS3);
> - for (i = 0; i < 4; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
> - case 0xCE4:
> - case 0xEE4:
> - case 0x18E4:
> - case 0x1aE4:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS4);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS5);
> - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS6);
> - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS7);
> - for (i = 0; i < 4; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
> - case 0xCE8:
> - case 0xEE8:
> - case 0x18E8:
> - case 0x1aE8:
> - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS8);
> - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS9);
> - for (i = 0; i < 2; ++i) {
> - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> - ((Value >> (i * 8)) & 0xF));
> - }
> - *RateNum = 4;
> - break;
> -
Here only 2 rates are set, so this feels like it is a 40MHz case, are you
sure this can be removed (maybe it is 40MHz channel use at 5GHz ?
The rest of the patch looks ok.
Regards,
Hans
> default:
> break;
> }
> @@ -617,10 +467,6 @@ static void PHY_StoreTxPowerByRateNew(
> return;
>
> for (i = 0; i < rateNum; ++i) {
> - if (rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0) ||
> - rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1))
> - TxNum = RF_2TX;
> -
> pHalData->TxPwrByRateOffset[RfPath][TxNum][rateIndex[i]] = PwrByRateVal[i];
> }
> }
> @@ -691,18 +537,6 @@ struct adapter *padapter
> u8 mcs16_23Rates[8] = {
> MGN_MCS16, MGN_MCS17, MGN_MCS18, MGN_MCS19, MGN_MCS20, MGN_MCS21, MGN_MCS22, MGN_MCS23
> };
> - u8 vht1ssRates[10] = {
> - MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
> - MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9
> - };
> - u8 vht2ssRates[10] = {
> - MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
> - MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9
> - };
> - u8 vht3ssRates[10] = {
> - MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
> - MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9
> - };
>
> for (path = ODM_RF_PATH_A; path <= ODM_RF_PATH_D; ++path) {
> for (txNum = RF_1TX; txNum < RF_MAX_TX_NUM; ++txNum) {
> @@ -740,27 +574,6 @@ struct adapter *padapter
> value = PHY_GetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i]);
> PHY_SetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i], value - base);
> }
> -
> - /* VHT 1SS */
> - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT1SS_MCS7);
> - for (i = 0; i < sizeof(vht1ssRates); ++i) {
> - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht1ssRates[i]);
> - PHY_SetTxPowerByRate(padapter, path, txNum, vht1ssRates[i], value - base);
> - }
> -
> - /* VHT 2SS */
> - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT2SS_MCS7);
> - for (i = 0; i < sizeof(vht2ssRates); ++i) {
> - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht2ssRates[i]);
> - PHY_SetTxPowerByRate(padapter, path, txNum, vht2ssRates[i], value - base);
> - }
> -
> - /* VHT 3SS */
> - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT3SS_MCS7);
> - for (i = 0; i < sizeof(vht3ssRates); ++i) {
> - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht3ssRates[i]);
> - PHY_SetTxPowerByRate(padapter, path, txNum, vht3ssRates[i], value - base);
> - }
> }
> }
> }
> @@ -823,38 +636,6 @@ void PHY_SetTxPowerIndexByRateSection(
> Channel, htRates4T,
> ARRAY_SIZE(htRates4T));
>
> - } else if (RateSection == VHT_1SSMCS0_1SSMCS9) {
> - u8 vhtRates1T[] = {MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
> - MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9};
> - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> - pHalData->CurrentChannelBW,
> - Channel, vhtRates1T,
> - ARRAY_SIZE(vhtRates1T));
> -
> - } else if (RateSection == VHT_2SSMCS0_2SSMCS9) {
> - u8 vhtRates2T[] = {MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
> - MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9};
> -
> - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> - pHalData->CurrentChannelBW,
> - Channel, vhtRates2T,
> - ARRAY_SIZE(vhtRates2T));
> - } else if (RateSection == VHT_3SSMCS0_3SSMCS9) {
> - u8 vhtRates3T[] = {MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
> - MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9};
> -
> - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> - pHalData->CurrentChannelBW,
> - Channel, vhtRates3T,
> - ARRAY_SIZE(vhtRates3T));
> - } else if (RateSection == VHT_4SSMCS0_4SSMCS9) {
> - u8 vhtRates4T[] = {MGN_VHT4SS_MCS0, MGN_VHT4SS_MCS1, MGN_VHT4SS_MCS2, MGN_VHT4SS_MCS3, MGN_VHT4SS_MCS4,
> - MGN_VHT4SS_MCS5, MGN_VHT4SS_MCS6, MGN_VHT4SS_MCS7, MGN_VHT4SS_MCS8, MGN_VHT4SS_MCS9};
> -
> - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> - pHalData->CurrentChannelBW,
> - Channel, vhtRates4T,
> - ARRAY_SIZE(vhtRates4T));
> }
> }
>
> @@ -883,23 +664,23 @@ u8 PHY_GetTxPowerIndexBase(
> txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S];
>
> if (BandWidth == CHANNEL_WIDTH_20) { /* BW20-1S, BW20-2S */
> - if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
> - if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW20_24G_Diff[RFPath][TX_2S];
> - if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW20_24G_Diff[RFPath][TX_3S];
> - if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW20_24G_Diff[RFPath][TX_4S];
>
> } else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */
> - if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
> - if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S];
> - if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S];
> - if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> + if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
> txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
>
> }
> @@ -1060,126 +841,6 @@ u8 PHY_GetRateIndexOfTxPowerByRate(u8 Rate)
> case MGN_MCS31:
> index = 43;
> break;
> - case MGN_VHT1SS_MCS0:
> - index = 44;
> - break;
> - case MGN_VHT1SS_MCS1:
> - index = 45;
> - break;
> - case MGN_VHT1SS_MCS2:
> - index = 46;
> - break;
> - case MGN_VHT1SS_MCS3:
> - index = 47;
> - break;
> - case MGN_VHT1SS_MCS4:
> - index = 48;
> - break;
> - case MGN_VHT1SS_MCS5:
> - index = 49;
> - break;
> - case MGN_VHT1SS_MCS6:
> - index = 50;
> - break;
> - case MGN_VHT1SS_MCS7:
> - index = 51;
> - break;
> - case MGN_VHT1SS_MCS8:
> - index = 52;
> - break;
> - case MGN_VHT1SS_MCS9:
> - index = 53;
> - break;
> - case MGN_VHT2SS_MCS0:
> - index = 54;
> - break;
> - case MGN_VHT2SS_MCS1:
> - index = 55;
> - break;
> - case MGN_VHT2SS_MCS2:
> - index = 56;
> - break;
> - case MGN_VHT2SS_MCS3:
> - index = 57;
> - break;
> - case MGN_VHT2SS_MCS4:
> - index = 58;
> - break;
> - case MGN_VHT2SS_MCS5:
> - index = 59;
> - break;
> - case MGN_VHT2SS_MCS6:
> - index = 60;
> - break;
> - case MGN_VHT2SS_MCS7:
> - index = 61;
> - break;
> - case MGN_VHT2SS_MCS8:
> - index = 62;
> - break;
> - case MGN_VHT2SS_MCS9:
> - index = 63;
> - break;
> - case MGN_VHT3SS_MCS0:
> - index = 64;
> - break;
> - case MGN_VHT3SS_MCS1:
> - index = 65;
> - break;
> - case MGN_VHT3SS_MCS2:
> - index = 66;
> - break;
> - case MGN_VHT3SS_MCS3:
> - index = 67;
> - break;
> - case MGN_VHT3SS_MCS4:
> - index = 68;
> - break;
> - case MGN_VHT3SS_MCS5:
> - index = 69;
> - break;
> - case MGN_VHT3SS_MCS6:
> - index = 70;
> - break;
> - case MGN_VHT3SS_MCS7:
> - index = 71;
> - break;
> - case MGN_VHT3SS_MCS8:
> - index = 72;
> - break;
> - case MGN_VHT3SS_MCS9:
> - index = 73;
> - break;
> - case MGN_VHT4SS_MCS0:
> - index = 74;
> - break;
> - case MGN_VHT4SS_MCS1:
> - index = 75;
> - break;
> - case MGN_VHT4SS_MCS2:
> - index = 76;
> - break;
> - case MGN_VHT4SS_MCS3:
> - index = 77;
> - break;
> - case MGN_VHT4SS_MCS4:
> - index = 78;
> - break;
> - case MGN_VHT4SS_MCS5:
> - index = 79;
> - break;
> - case MGN_VHT4SS_MCS6:
> - index = 80;
> - break;
> - case MGN_VHT4SS_MCS7:
> - index = 81;
> - break;
> - case MGN_VHT4SS_MCS8:
> - index = 82;
> - break;
> - case MGN_VHT4SS_MCS9:
> - index = 83;
> - break;
> default:
> break;
> }
> @@ -1319,26 +980,6 @@ static s16 get_rate_sctn_idx(const u8 rate)
> case MGN_MCS24: case MGN_MCS25: case MGN_MCS26: case MGN_MCS27:
> case MGN_MCS28: case MGN_MCS29: case MGN_MCS30: case MGN_MCS31:
> return 5;
> - case MGN_VHT1SS_MCS0: case MGN_VHT1SS_MCS1: case MGN_VHT1SS_MCS2:
> - case MGN_VHT1SS_MCS3: case MGN_VHT1SS_MCS4: case MGN_VHT1SS_MCS5:
> - case MGN_VHT1SS_MCS6: case MGN_VHT1SS_MCS7: case MGN_VHT1SS_MCS8:
> - case MGN_VHT1SS_MCS9:
> - return 6;
> - case MGN_VHT2SS_MCS0: case MGN_VHT2SS_MCS1: case MGN_VHT2SS_MCS2:
> - case MGN_VHT2SS_MCS3: case MGN_VHT2SS_MCS4: case MGN_VHT2SS_MCS5:
> - case MGN_VHT2SS_MCS6: case MGN_VHT2SS_MCS7: case MGN_VHT2SS_MCS8:
> - case MGN_VHT2SS_MCS9:
> - return 7;
> - case MGN_VHT3SS_MCS0: case MGN_VHT3SS_MCS1: case MGN_VHT3SS_MCS2:
> - case MGN_VHT3SS_MCS3: case MGN_VHT3SS_MCS4: case MGN_VHT3SS_MCS5:
> - case MGN_VHT3SS_MCS6: case MGN_VHT3SS_MCS7: case MGN_VHT3SS_MCS8:
> - case MGN_VHT3SS_MCS9:
> - return 8;
> - case MGN_VHT4SS_MCS0: case MGN_VHT4SS_MCS1: case MGN_VHT4SS_MCS2:
> - case MGN_VHT4SS_MCS3: case MGN_VHT4SS_MCS4: case MGN_VHT4SS_MCS5:
> - case MGN_VHT4SS_MCS6: case MGN_VHT4SS_MCS7: case MGN_VHT4SS_MCS8:
> - case MGN_VHT4SS_MCS9:
> - return 9;
> default:
> return -1;
> }
> @@ -1510,14 +1151,6 @@ void PHY_SetTxPowerLimit(
> rateSection = 4;
> else if (eqNByte(RateSection, (u8 *)("HT"), 2) && eqNByte(RfPath, (u8 *)("4T"), 2))
> rateSection = 5;
> - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("1T"), 2))
> - rateSection = 6;
> - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("2T"), 2))
> - rateSection = 7;
> - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("3T"), 2))
> - rateSection = 8;
> - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("4T"), 2))
> - rateSection = 9;
> else
> return;
>
> diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
> index 6bcc443d59fb..1bc332261b2a 100644
> --- a/drivers/staging/rtl8723bs/include/hal_com.h
> +++ b/drivers/staging/rtl8723bs/include/hal_com.h
> @@ -69,46 +69,6 @@
> #define DESC_RATEMCS29 0x29
> #define DESC_RATEMCS30 0x2A
> #define DESC_RATEMCS31 0x2B
> -#define DESC_RATEVHTSS1MCS0 0x2C
> -#define DESC_RATEVHTSS1MCS1 0x2D
> -#define DESC_RATEVHTSS1MCS2 0x2E
> -#define DESC_RATEVHTSS1MCS3 0x2F
> -#define DESC_RATEVHTSS1MCS4 0x30
> -#define DESC_RATEVHTSS1MCS5 0x31
> -#define DESC_RATEVHTSS1MCS6 0x32
> -#define DESC_RATEVHTSS1MCS7 0x33
> -#define DESC_RATEVHTSS1MCS8 0x34
> -#define DESC_RATEVHTSS1MCS9 0x35
> -#define DESC_RATEVHTSS2MCS0 0x36
> -#define DESC_RATEVHTSS2MCS1 0x37
> -#define DESC_RATEVHTSS2MCS2 0x38
> -#define DESC_RATEVHTSS2MCS3 0x39
> -#define DESC_RATEVHTSS2MCS4 0x3A
> -#define DESC_RATEVHTSS2MCS5 0x3B
> -#define DESC_RATEVHTSS2MCS6 0x3C
> -#define DESC_RATEVHTSS2MCS7 0x3D
> -#define DESC_RATEVHTSS2MCS8 0x3E
> -#define DESC_RATEVHTSS2MCS9 0x3F
> -#define DESC_RATEVHTSS3MCS0 0x40
> -#define DESC_RATEVHTSS3MCS1 0x41
> -#define DESC_RATEVHTSS3MCS2 0x42
> -#define DESC_RATEVHTSS3MCS3 0x43
> -#define DESC_RATEVHTSS3MCS4 0x44
> -#define DESC_RATEVHTSS3MCS5 0x45
> -#define DESC_RATEVHTSS3MCS6 0x46
> -#define DESC_RATEVHTSS3MCS7 0x47
> -#define DESC_RATEVHTSS3MCS8 0x48
> -#define DESC_RATEVHTSS3MCS9 0x49
> -#define DESC_RATEVHTSS4MCS0 0x4A
> -#define DESC_RATEVHTSS4MCS1 0x4B
> -#define DESC_RATEVHTSS4MCS2 0x4C
> -#define DESC_RATEVHTSS4MCS3 0x4D
> -#define DESC_RATEVHTSS4MCS4 0x4E
> -#define DESC_RATEVHTSS4MCS5 0x4F
> -#define DESC_RATEVHTSS4MCS6 0x50
> -#define DESC_RATEVHTSS4MCS7 0x51
> -#define DESC_RATEVHTSS4MCS8 0x52
> -#define DESC_RATEVHTSS4MCS9 0x53
>
> #define HDATA_RATE(rate)\
> (rate == DESC_RATE1M) ? "CCK_1M" : \
> @@ -138,27 +98,7 @@
> (rate == DESC_RATEMCS12) ? "MCS12" : \
> (rate == DESC_RATEMCS13) ? "MCS13" : \
> (rate == DESC_RATEMCS14) ? "MCS14" : \
> -(rate == DESC_RATEMCS15) ? "MCS15" : \
> -(rate == DESC_RATEVHTSS1MCS0) ? "VHTSS1MCS0" : \
> -(rate == DESC_RATEVHTSS1MCS1) ? "VHTSS1MCS1" : \
> -(rate == DESC_RATEVHTSS1MCS2) ? "VHTSS1MCS2" : \
> -(rate == DESC_RATEVHTSS1MCS3) ? "VHTSS1MCS3" : \
> -(rate == DESC_RATEVHTSS1MCS4) ? "VHTSS1MCS4" : \
> -(rate == DESC_RATEVHTSS1MCS5) ? "VHTSS1MCS5" : \
> -(rate == DESC_RATEVHTSS1MCS6) ? "VHTSS1MCS6" : \
> -(rate == DESC_RATEVHTSS1MCS7) ? "VHTSS1MCS7" : \
> -(rate == DESC_RATEVHTSS1MCS8) ? "VHTSS1MCS8" : \
> -(rate == DESC_RATEVHTSS1MCS9) ? "VHTSS1MCS9" : \
> -(rate == DESC_RATEVHTSS2MCS0) ? "VHTSS2MCS0" : \
> -(rate == DESC_RATEVHTSS2MCS1) ? "VHTSS2MCS1" : \
> -(rate == DESC_RATEVHTSS2MCS2) ? "VHTSS2MCS2" : \
> -(rate == DESC_RATEVHTSS2MCS3) ? "VHTSS2MCS3" : \
> -(rate == DESC_RATEVHTSS2MCS4) ? "VHTSS2MCS4" : \
> -(rate == DESC_RATEVHTSS2MCS5) ? "VHTSS2MCS5" : \
> -(rate == DESC_RATEVHTSS2MCS6) ? "VHTSS2MCS6" : \
> -(rate == DESC_RATEVHTSS2MCS7) ? "VHTSS2MCS7" : \
> -(rate == DESC_RATEVHTSS2MCS8) ? "VHTSS2MCS8" : \
> -(rate == DESC_RATEVHTSS2MCS9) ? "VHTSS2MCS9" : "UNKNOWN"
> +(rate == DESC_RATEMCS15) ? "MCS15" : "UNKNOWN"
>
>
> enum{
> diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> index 3d95ab1986b1..c966d0e3e5ae 100644
> --- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> +++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> @@ -19,10 +19,6 @@ enum rate_section {
> HT_MCS8_MCS15,
> HT_MCS16_MCS23,
> HT_MCS24_MCS31,
> - VHT_1SSMCS0_1SSMCS9,
> - VHT_2SSMCS0_2SSMCS9,
> - VHT_3SSMCS0_3SSMCS9,
> - VHT_4SSMCS0_4SSMCS9,
> };
>
> enum {
> diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
> index ac88bd30b097..378c21595e05 100644
> --- a/drivers/staging/rtl8723bs/include/ieee80211.h
> +++ b/drivers/staging/rtl8723bs/include/ieee80211.h
> @@ -60,7 +60,6 @@ enum {
> #define WLAN_STA_HT BIT(11)
> #define WLAN_STA_WPS BIT(12)
> #define WLAN_STA_MAYBE_WPS BIT(13)
> -#define WLAN_STA_VHT BIT(14)
> #define WLAN_STA_NONERP BIT(31)
>
> #define IEEE_CMD_SET_WPA_PARAM 1
> @@ -135,8 +134,6 @@ enum {
> RATEID_IDX_BG = 6,
> RATEID_IDX_G = 7,
> RATEID_IDX_B = 8,
> - RATEID_IDX_VHT_2SS = 9,
> - RATEID_IDX_VHT_1SS = 10,
> };
>
> enum network_type {
> @@ -424,51 +421,10 @@ enum {
> MGN_MCS29,
> MGN_MCS30,
> MGN_MCS31,
> - MGN_VHT1SS_MCS0,
> - MGN_VHT1SS_MCS1,
> - MGN_VHT1SS_MCS2,
> - MGN_VHT1SS_MCS3,
> - MGN_VHT1SS_MCS4,
> - MGN_VHT1SS_MCS5,
> - MGN_VHT1SS_MCS6,
> - MGN_VHT1SS_MCS7,
> - MGN_VHT1SS_MCS8,
> - MGN_VHT1SS_MCS9,
> - MGN_VHT2SS_MCS0,
> - MGN_VHT2SS_MCS1,
> - MGN_VHT2SS_MCS2,
> - MGN_VHT2SS_MCS3,
> - MGN_VHT2SS_MCS4,
> - MGN_VHT2SS_MCS5,
> - MGN_VHT2SS_MCS6,
> - MGN_VHT2SS_MCS7,
> - MGN_VHT2SS_MCS8,
> - MGN_VHT2SS_MCS9,
> - MGN_VHT3SS_MCS0,
> - MGN_VHT3SS_MCS1,
> - MGN_VHT3SS_MCS2,
> - MGN_VHT3SS_MCS3,
> - MGN_VHT3SS_MCS4,
> - MGN_VHT3SS_MCS5,
> - MGN_VHT3SS_MCS6,
> - MGN_VHT3SS_MCS7,
> - MGN_VHT3SS_MCS8,
> - MGN_VHT3SS_MCS9,
> - MGN_VHT4SS_MCS0,
> - MGN_VHT4SS_MCS1,
> - MGN_VHT4SS_MCS2,
> - MGN_VHT4SS_MCS3,
> - MGN_VHT4SS_MCS4,
> - MGN_VHT4SS_MCS5,
> - MGN_VHT4SS_MCS6,
> - MGN_VHT4SS_MCS7,
> - MGN_VHT4SS_MCS8,
> - MGN_VHT4SS_MCS9,
> MGN_UNKNOWN
> };
>
> #define IS_HT_RATE(_rate) (_rate >= MGN_MCS0 && _rate <= MGN_MCS31)
> -#define IS_VHT_RATE(_rate) (_rate >= MGN_VHT1SS_MCS0 && _rate <= MGN_VHT4SS_MCS9)
> #define IS_CCK_RATE(_rate) (MGN_1M == _rate || _rate == MGN_2M || _rate == MGN_5_5M || _rate == MGN_11M)
> #define IS_OFDM_RATE(_rate) (MGN_6M <= _rate && _rate <= MGN_54M && _rate != MGN_11M)
>
> @@ -625,7 +581,6 @@ enum {
> RTW_WLAN_CATEGORY_TDLS = 12,
> RTW_WLAN_CATEGORY_SELF_PROTECTED = 15, /* add for CONFIG_IEEE80211W, none 11w also can use */
> RTW_WLAN_CATEGORY_WMM = 17,
> - RTW_WLAN_CATEGORY_VHT = 21,
> RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
> };
>
> diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> index 56bdc14af47d..9dd329a5208a 100644
> --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> @@ -402,27 +402,6 @@ struct txdesc_8723b {
> #define DESC8723B_RATEMCS13 0x19
> #define DESC8723B_RATEMCS14 0x1a
> #define DESC8723B_RATEMCS15 0x1b
> -#define DESC8723B_RATEVHTSS1MCS0 0x2c
> -#define DESC8723B_RATEVHTSS1MCS1 0x2d
> -#define DESC8723B_RATEVHTSS1MCS2 0x2e
> -#define DESC8723B_RATEVHTSS1MCS3 0x2f
> -#define DESC8723B_RATEVHTSS1MCS4 0x30
> -#define DESC8723B_RATEVHTSS1MCS5 0x31
> -#define DESC8723B_RATEVHTSS1MCS6 0x32
> -#define DESC8723B_RATEVHTSS1MCS7 0x33
> -#define DESC8723B_RATEVHTSS1MCS8 0x34
> -#define DESC8723B_RATEVHTSS1MCS9 0x35
> -#define DESC8723B_RATEVHTSS2MCS0 0x36
> -#define DESC8723B_RATEVHTSS2MCS1 0x37
> -#define DESC8723B_RATEVHTSS2MCS2 0x38
> -#define DESC8723B_RATEVHTSS2MCS3 0x39
> -#define DESC8723B_RATEVHTSS2MCS4 0x3a
> -#define DESC8723B_RATEVHTSS2MCS5 0x3b
> -#define DESC8723B_RATEVHTSS2MCS6 0x3c
> -#define DESC8723B_RATEVHTSS2MCS7 0x3d
> -#define DESC8723B_RATEVHTSS2MCS8 0x3e
> -#define DESC8723B_RATEVHTSS2MCS9 0x3f
> -
>
> #define RX_HAL_IS_CCK_RATE_8723B(pDesc)\
> (GET_RX_STATUS_DESC_RX_RATE_8723B(pDesc) == DESC8723B_RATE1M ||\
> diff --git a/drivers/staging/rtl8723bs/include/rtw_ht.h b/drivers/staging/rtl8723bs/include/rtw_ht.h
> index e3f353fe1e47..1527d8be2d7a 100644
> --- a/drivers/staging/rtl8723bs/include/rtw_ht.h
> +++ b/drivers/staging/rtl8723bs/include/rtw_ht.h
> @@ -42,10 +42,6 @@ enum {
> HT_AGG_SIZE_16K = 1,
> HT_AGG_SIZE_32K = 2,
> HT_AGG_SIZE_64K = 3,
> - VHT_AGG_SIZE_128K = 4,
> - VHT_AGG_SIZE_256K = 5,
> - VHT_AGG_SIZE_512K = 6,
> - VHT_AGG_SIZE_1024K = 7,
> };
>
> enum {
>
Hi,
On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> remove register initializations tied to 802.11ac standard which
> is not supported by the device.
>
> It's a dangerous operation, relying only on comments, but tested
> on a Lenovo Ideapad MIIX 300-10IBY tablet seems to work.
>
> Signed-off-by: Fabio Aiuto <[email protected]>
TBH I think this patch should be dropped from the series, you
are dropping a bunch of register writes which likely are actually
doing something, so this is not just dead code removal.
Regards,
Hans
> ---
> drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> index 059d3050acc6..3a03dfb8d275 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> @@ -1718,24 +1718,12 @@ void _InitBurstPktLen_8723BS(struct adapter *Adapter)
> struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
>
> rtw_write8(Adapter, 0x4c7, rtw_read8(Adapter, 0x4c7)|BIT(7)); /* enable single pkt ampdu */
> - rtw_write8(Adapter, REG_RX_PKT_LIMIT_8723B, 0x18); /* for VHT packet length 11K */
> rtw_write8(Adapter, REG_MAX_AGGR_NUM_8723B, 0x1F);
> rtw_write8(Adapter, REG_PIFS_8723B, 0x00);
> rtw_write8(Adapter, REG_FWHW_TXQ_CTRL_8723B, rtw_read8(Adapter, REG_FWHW_TXQ_CTRL)&(~BIT(7)));
> if (pHalData->AMPDUBurstMode)
> rtw_write8(Adapter, REG_AMPDU_BURST_MODE_8723B, 0x5F);
> rtw_write8(Adapter, REG_AMPDU_MAX_TIME_8723B, 0x70);
> -
> - /* ARFB table 9 for 11ac 5G 2SS */
> - rtw_write32(Adapter, REG_ARFR0_8723B, 0x00000010);
> - if (IS_NORMAL_CHIP(pHalData->VersionID))
> - rtw_write32(Adapter, REG_ARFR0_8723B+4, 0xfffff000);
> - else
> - rtw_write32(Adapter, REG_ARFR0_8723B+4, 0x3e0ff000);
> -
> - /* ARFB table 10 for 11ac 5G 1SS */
> - rtw_write32(Adapter, REG_ARFR1_8723B, 0x00000010);
> - rtw_write32(Adapter, REG_ARFR1_8723B+4, 0x003ff000);
> }
>
> static void ResumeTxBeacon(struct adapter *padapter)
>
Hi Fabio,
On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> This patch series removes all occurences of 5Ghz code over the
> driver as required from driver's TODO list:
>
> - find and remove remaining code valid only for 5 GHz.
> most of the obvious one have been removed, but things
> like channel > 14 still exist.
>
> rtl8723bs work on 2.4Ghz band and supports 802.11bgn standards.
> So all code related to 802.11a/ac standard is removed, as well
> as code related to channel numbers above 14.
>
> VHT code is deleted as well, for it's related to 802.11ac.
>
> Comments are fixed accordingly and many unused variables are
> deleted.
>
> Every single patch of this series has been tested on a
> Lenovo Ideapad MIIX 300-10IBY except for the last one,
> for obvious reason (it deletes just the TODO item).
Thank you for your work on this. I've replied to 3 of
the patches with some comments. The rest of the series
looks ok to me (based on a quick scan of the patches).
Regards,
Hans
>
> So:
>
> Tested-by: Fabio Auto <[email protected]>
>
> Fabio Aiuto (18):
> staging: rtl8723bs: remove all 5Ghz network types
> staging: rtl8723bs: remove code related to unsupported channel
> bandwidth
> staging: rtl8723bs: remove unused enum items related to channel
> bonding
> staging: rtl8723bs: rename enum items related to channel bonding
> staging: rtl8723bs: remove 5Ghz field in struct registry_priv
> staging: rtl8723bs: remove struct rt_channel_plan_5g
> staging: rtl8723bs: remove all branchings between 2.4Ghz and 5Ghz band
> types
> staging: rtl8723bs: beautify prototypes in include/hal_com_phycfg.h
> staging: rtl8723bs: remove 5Ghz code related to channel plan
> definition
> staging: rtl8723bs: remove some unused 5Ghz macro definitions
> staging: rtl8723bs: remove 5Ghz code related to RF power calibration
> staging: rtl8723bs: remove VHT dead code
> staging: rtl8723bs: remove unused ODM_CMNINFO_BOARD_TYPE enum item
> staging: rtl8723bs: fix macro value for 2.4Ghz only device
> staging: rtl8723bs: remove register initializations tied to 802.11ac
> standard
> staging: rtl8723bs: remove obsolete 5Ghz comments
> staging: rtl8723bs: fix check allowing 5Ghz settings
> staging: rtl8723bs: remove item from TODO list
>
> drivers/staging/rtl8723bs/TODO | 2 -
> drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +-
> .../staging/rtl8723bs/core/rtw_ieee80211.c | 22 +-
> drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 -
> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 328 ++---
> .../staging/rtl8723bs/core/rtw_wlan_util.c | 29 +-
> drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 +-
> .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 4 +-
> .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 5 +-
> drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 -
> .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 17 +-
> .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 595 ++++-----
> .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 19 +-
> drivers/staging/rtl8723bs/hal/hal_btcoex.c | 4 -
> drivers/staging/rtl8723bs/hal/hal_com.c | 241 ----
> .../staging/rtl8723bs/hal/hal_com_phycfg.c | 1059 +++--------------
> drivers/staging/rtl8723bs/hal/odm.c | 50 -
> drivers/staging/rtl8723bs/hal/odm.h | 42 +-
> drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 -
> .../rtl8723bs/hal/odm_EdcaTurboCheck.c | 4 +-
> .../rtl8723bs/hal/odm_RegConfig8723B.c | 5 +-
> .../rtl8723bs/hal/odm_RegConfig8723B.h | 2 -
> drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 1 -
> .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 53 +-
> .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 43 +-
> drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 -
> .../rtl8723bs/include/Hal8192CPhyReg.h | 2 -
> drivers/staging/rtl8723bs/include/drv_types.h | 10 +-
> drivers/staging/rtl8723bs/include/hal_com.h | 62 +-
> .../rtl8723bs/include/hal_com_phycfg.h | 198 +--
> .../staging/rtl8723bs/include/hal_com_reg.h | 1 -
> drivers/staging/rtl8723bs/include/hal_data.h | 40 +-
> drivers/staging/rtl8723bs/include/hal_pg.h | 2 -
> drivers/staging/rtl8723bs/include/hal_phy.h | 10 -
> drivers/staging/rtl8723bs/include/ieee80211.h | 67 +-
> .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
> drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
> .../staging/rtl8723bs/include/rtw_mlme_ext.h | 52 +-
> drivers/staging/rtl8723bs/include/rtw_rf.h | 33 +-
> drivers/staging/rtl8723bs/include/wifi.h | 1 -
> .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 -
> .../staging/rtl8723bs/os_dep/ioctl_linux.c | 8 +-
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 13 +-
> drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 -
> 44 files changed, 640 insertions(+), 2450 deletions(-)
>
Hi Hans,
thank you for your reviews,
On Mon, Jun 21, 2021 at 11:40:47AM +0200, Hans de Goede wrote:
> Hi,
>
> Thank you for your work in this.
>
> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> > remove all 5Ghz network types. rtl8723bs works on
> > 802.11bgn standards and on 2.4Ghz band.
> >
> > So remove all code related to 802.11a and 802.11ac
> > standards, which the device doesn't support.
> >
> > Signed-off-by: Fabio Aiuto <[email protected]>
> > ---
> > drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +---
> > .../staging/rtl8723bs/core/rtw_ieee80211.c | 22 ++------
> > drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 ----
> > drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 55 -------------------
> > .../staging/rtl8723bs/core/rtw_wlan_util.c | 14 +----
> > drivers/staging/rtl8723bs/hal/odm.c | 30 ----------
> > drivers/staging/rtl8723bs/hal/odm.h | 3 -
> > .../rtl8723bs/hal/odm_EdcaTurboCheck.c | 4 +-
> > drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 --
> > drivers/staging/rtl8723bs/include/hal_phy.h | 3 -
> > drivers/staging/rtl8723bs/include/ieee80211.h | 22 +-------
> > drivers/staging/rtl8723bs/include/wifi.h | 1 -
> > drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
> > 13 files changed, 14 insertions(+), 167 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
> > index 23bbdf084631..b0abadd4b4dd 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_ap.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
> > @@ -343,10 +343,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
> >
> > if (pcur_network->Configuration.DSConfig > 14) {
>
> This if sounds like it is checking for a channel-nr greater
> then 14, so maybe this entire block should go away ?
>
> > if (tx_ra_bitmap & 0xffff000)
> > - sta_band |= WIRELESS_11_5N;
> > -
> > - if (tx_ra_bitmap & 0xff0)
> > - sta_band |= WIRELESS_11A;
> > + sta_band |= WIRELESS_INVALID;
>
> You are replacing 2 if-s with 1 here, so you should also or
> the 2 masks being checked for togehter, iow there now should
> be one if like this:
>
> if (tx_ra_bitmap & (0xffff000 | 0xff0))
> sta_band |= WIRELESS_INVALID;
>
> Which can be simplified to:
>
> if (tx_ra_bitmap & 0xffffff0)
> sta_band |= WIRELESS_INVALID;
The idea was to just set unconditionally sta_band to
WIRELESS_INVALID for we are on a channel > 14, so
by definition in an invalid wireless network, no
need to check further.
>
> The rest of the patch looks ok (from a quick scan).
>
> Regards,
>
> Hans
>
>
>
> > } else {
> > if (tx_ra_bitmap & 0xffff000)
> > sta_band |= WIRELESS_11_24N;
> > @@ -412,7 +409,7 @@ void update_bmc_sta(struct adapter *padapter)
> > } else if (network_type == WIRELESS_INVALID) { /* error handling */
> >
> > if (pcur_network->Configuration.DSConfig > 14)
> > - network_type = WIRELESS_11A;
> > + network_type = WIRELESS_INVALID;
> > else
> > network_type = WIRELESS_11B;
> > }
> > @@ -1115,9 +1112,6 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
> > case WIRELESS_11BG_24N:
> > pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
> > break;
> > - case WIRELESS_11A:
> > - pbss_network->NetworkTypeInUse = Ndis802_11OFDM5;
> > - break;
> > default:
> > pbss_network->NetworkTypeInUse = Ndis802_11OFDM24;
> > break;
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> > index e341789954b9..0f0fcd9dc652 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
> > @@ -96,10 +96,7 @@ bool rtw_is_cckratesonly_included(u8 *rate)
> > int rtw_check_network_type(unsigned char *rate, int ratelen, int channel)
> > {
> > if (channel > 14) {
> > - if (rtw_is_cckrates_included(rate))
> > - return WIRELESS_INVALID;
> > - else
> > - return WIRELESS_11A;
> > + return WIRELESS_INVALID;
> > } else { /* could be pure B, pure G, or B/G */
> > if (rtw_is_cckratesonly_included(rate))
> > return WIRELESS_11B;
> > @@ -266,10 +263,6 @@ void rtw_set_supported_rate(u8 *SupportedRates, uint mode)
> > break;
> >
> > case WIRELESS_11G:
> > - case WIRELESS_11A:
> > - case WIRELESS_11_5N:
> > - case WIRELESS_11A_5N:/* Todo: no basic rate for ofdm ? */
> > - case WIRELESS_11_5AC:
> > memcpy(SupportedRates, WIFI_OFDMRATES, IEEE80211_NUM_OFDM_RATESLEN);
> > break;
> >
> > @@ -327,14 +320,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
> > ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->Ssid.SsidLength, pdev_network->Ssid.Ssid, &sz);
> >
> > /* supported rates */
> > - if (pregistrypriv->wireless_mode == WIRELESS_11ABGN) {
> > - if (pdev_network->Configuration.DSConfig > 14)
> > - wireless_mode = WIRELESS_11A_5N;
> > - else
> > - wireless_mode = WIRELESS_11BG_24N;
> > - } else {
> > - wireless_mode = pregistrypriv->wireless_mode;
> > - }
> > + wireless_mode = pregistrypriv->wireless_mode;
> >
> > rtw_set_supported_rate(pdev_network->SupportedRates, wireless_mode);
> >
> > @@ -359,8 +345,8 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
> > }
> >
> > /* HT Cap. */
> > - if (((pregistrypriv->wireless_mode&WIRELESS_11_5N) || (pregistrypriv->wireless_mode&WIRELESS_11_24N))
> > - && (pregistrypriv->ht_enable == true)) {
> > + if ((pregistrypriv->wireless_mode & WIRELESS_11_24N) &&
> > + (pregistrypriv->ht_enable == true)) {
> > /* todo: */
> > }
> >
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> > index 158f92d4d882..2dd75e007239 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> > @@ -2184,16 +2184,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
> > case WIRELESS_11BG_24N:
> > pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
> > break;
> > - case WIRELESS_11A:
> > - case WIRELESS_11A_5N:
> > - pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
> > - break;
> > - case WIRELESS_11ABGN:
> > - if (pregistrypriv->channel > 14)
> > - pdev_network->NetworkTypeInUse = (Ndis802_11OFDM5);
> > - else
> > - pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
> > - break;
> > default:
> > /* TODO */
> > break;
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > index 4df3cba97f42..106779fb9fef 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > @@ -4478,61 +4478,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
> > }
> > }
> >
> > - if (pregistrypriv->wireless_mode & WIRELESS_11A) {
> > - do {
> > - if ((i == MAX_CHANNEL_NUM) ||
> > - (chplan_sta[i].ChannelNum == 0))
> > - break;
> > -
> > - if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] == 0))
> > - break;
> > -
> > - if (chplan_sta[i].ChannelNum == chplan_ap.Channel[j]) {
> > - chplan_new[k].ChannelNum = chplan_ap.Channel[j];
> > - chplan_new[k].ScanType = SCAN_ACTIVE;
> > - i++;
> > - j++;
> > - k++;
> > - } else if (chplan_sta[i].ChannelNum < chplan_ap.Channel[j]) {
> > - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
> > -/* chplan_new[k].ScanType = chplan_sta[i].ScanType; */
> > - chplan_new[k].ScanType = SCAN_PASSIVE;
> > - i++;
> > - k++;
> > - } else if (chplan_sta[i].ChannelNum > chplan_ap.Channel[j]) {
> > - chplan_new[k].ChannelNum = chplan_ap.Channel[j];
> > - chplan_new[k].ScanType = SCAN_ACTIVE;
> > - j++;
> > - k++;
> > - }
> > - } while (1);
> > -
> > - /* change AP not support channel to Passive scan */
> > - while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
> > - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
> > -/* chplan_new[k].ScanType = chplan_sta[i].ScanType; */
> > - chplan_new[k].ScanType = SCAN_PASSIVE;
> > - i++;
> > - k++;
> > - }
> > -
> > - /* add channel AP supported */
> > - while ((j < chplan_ap.Len) && (chplan_ap.Channel[j] != 0)) {
> > - chplan_new[k].ChannelNum = chplan_ap.Channel[j];
> > - chplan_new[k].ScanType = SCAN_ACTIVE;
> > - j++;
> > - k++;
> > - }
> > - } else {
> > - /* keep original STA 5G channel plan */
> > - while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
> > - chplan_new[k].ChannelNum = chplan_sta[i].ChannelNum;
> > - chplan_new[k].ScanType = chplan_sta[i].ScanType;
> > - i++;
> > - k++;
> > - }
> > - }
> > -
> > pmlmeext->update_channel_plan_by_ap_done = 1;
> > }
> >
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> > index afabb9d48021..2a47d678de01 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
> > @@ -55,9 +55,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
> >
> > if (cur_rf_type == RF_1T1R) {
> > rf_type = RF_1T1R;
> > - } else if (IsSupportedVHT(psta->wireless_mode)) {
> > - if (psta->ra_mask & 0xffc00000)
> > - rf_type = RF_2T2R;
> > } else if (IsSupportedHT(psta->wireless_mode)) {
> > if (psta->ra_mask & 0xfff00000)
> > rf_type = RF_2T2R;
> > @@ -67,7 +64,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
> > case WIRELESS_11B:
> > raid = RATEID_IDX_B;
> > break;
> > - case WIRELESS_11A:
> > case WIRELESS_11G:
> > raid = RATEID_IDX_G;
> > break;
> > @@ -75,8 +71,6 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
> > raid = RATEID_IDX_BG;
> > break;
> > case WIRELESS_11_24N:
> > - case WIRELESS_11_5N:
> > - case WIRELESS_11A_5N:
> > case WIRELESS_11G_24N:
> > if (rf_type == RF_2T2R)
> > raid = RATEID_IDX_GN_N2SS;
> > @@ -827,7 +821,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
> >
> > AIFS = aSifsTime + (2 * pmlmeinfo->slotTime);
> >
> > - if (pmlmeext->cur_wireless_mode & (WIRELESS_11G | WIRELESS_11A)) {
> > + if (pmlmeext->cur_wireless_mode & WIRELESS_11G) {
> > ECWMin = 4;
> > ECWMax = 10;
> > } else if (pmlmeext->cur_wireless_mode & WIRELESS_11B) {
> > @@ -1623,7 +1617,7 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
> > pmlmeinfo->slotTime = NON_SHORT_SLOT_TIME;
> > } else {
> > /* Filen: See 802.11-2007 p.90 */
> > - if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N | WIRELESS_11A | WIRELESS_11_5N | WIRELESS_11AC)) {
> > + if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N)) {
> > pmlmeinfo->slotTime = SHORT_SLOT_TIME;
> > } else if (pmlmeext->cur_wireless_mode & (WIRELESS_11G)) {
> > if ((updateCap & cShortSlotTime) /* && (!(pMgntInfo->pHTInfo->RT2RT_HT_Mode & RT_HT_CAP_USE_LONG_PREAMBLE)) */)
> > @@ -1653,9 +1647,7 @@ void update_wireless_mode(struct adapter *padapter)
> > if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
> > pmlmeinfo->HT_enable = 1;
> >
> > - if (pmlmeinfo->VHT_enable)
> > - network_type = WIRELESS_11AC;
> > - else if (pmlmeinfo->HT_enable)
> > + if (pmlmeinfo->HT_enable)
> > network_type = WIRELESS_11_24N;
> >
> > if (rtw_is_cckratesonly_included(rate))
> > diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
> > index fa275138c983..bfe0c3a773af 100644
> > --- a/drivers/staging/rtl8723bs/hal/odm.c
> > +++ b/drivers/staging/rtl8723bs/hal/odm.c
> > @@ -377,7 +377,6 @@ u32 ODM_Get_Rate_Bitmap(
> > break;
> >
> > case (ODM_WM_G):
> > - case (ODM_WM_A):
> > if (rssi_level == DM_RATR_STA_HIGH)
> > rate_bitmap = 0x00000f00;
> > else
> > @@ -396,7 +395,6 @@ u32 ODM_Get_Rate_Bitmap(
> > case (ODM_WM_B|ODM_WM_G|ODM_WM_N24G):
> > case (ODM_WM_B|ODM_WM_N24G):
> > case (ODM_WM_G|ODM_WM_N24G):
> > - case (ODM_WM_A|ODM_WM_N5G):
> > if (pDM_Odm->RFType == ODM_1T2R || pDM_Odm->RFType == ODM_1T1R) {
> > if (rssi_level == DM_RATR_STA_HIGH)
> > rate_bitmap = 0x000f0000;
> > @@ -422,34 +420,6 @@ u32 ODM_Get_Rate_Bitmap(
> > }
> > break;
> >
> > - case (ODM_WM_AC|ODM_WM_G):
> > - if (rssi_level == 1)
> > - rate_bitmap = 0xfc3f0000;
> > - else if (rssi_level == 2)
> > - rate_bitmap = 0xfffff000;
> > - else
> > - rate_bitmap = 0xffffffff;
> > - break;
> > -
> > - case (ODM_WM_AC|ODM_WM_A):
> > -
> > - if (pDM_Odm->RFType == RF_1T1R) {
> > - if (rssi_level == 1) /* add by Gary for ac-series */
> > - rate_bitmap = 0x003f8000;
> > - else if (rssi_level == 2)
> > - rate_bitmap = 0x003ff000;
> > - else
> > - rate_bitmap = 0x003ff010;
> > - } else {
> > - if (rssi_level == 1) /* add by Gary for ac-series */
> > - rate_bitmap = 0xfe3f8000; /* VHT 2SS MCS3~9 */
> > - else if (rssi_level == 2)
> > - rate_bitmap = 0xfffff000; /* VHT 2SS MCS0~9 */
> > - else
> > - rate_bitmap = 0xfffff010; /* All */
> > - }
> > - break;
> > -
> > default:
> > if (pDM_Odm->RFType == RF_1T2R)
> > rate_bitmap = 0x000fffff;
> > diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
> > index 950e7850bac2..7e2d3679c7d0 100644
> > --- a/drivers/staging/rtl8723bs/hal/odm.h
> > +++ b/drivers/staging/rtl8723bs/hal/odm.h
> > @@ -455,11 +455,8 @@ enum { /* tag_Wireless_Mode_Definition */
> > ODM_WM_UNKNOWN = 0x0,
> > ODM_WM_B = BIT0,
> > ODM_WM_G = BIT1,
> > - ODM_WM_A = BIT2,
> > ODM_WM_N24G = BIT3,
> > - ODM_WM_N5G = BIT4,
> > ODM_WM_AUTO = BIT5,
> > - ODM_WM_AC = BIT6,
> > };
> >
> > /* ODM_CMNINFO_BAND */
> > diff --git a/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c b/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
> > index f3856e47bfd3..578d5712645c 100644
> > --- a/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
> > +++ b/drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c
> > @@ -124,12 +124,10 @@ void odm_EdcaTurboCheckCE(void *pDM_VOID)
> > } else if ((iot_peer == HT_IOT_PEER_CISCO) &&
> > ((wirelessmode == ODM_WM_G) ||
> > (wirelessmode == (ODM_WM_B | ODM_WM_G)) ||
> > - (wirelessmode == ODM_WM_A) ||
> > (wirelessmode == ODM_WM_B))) {
> > EDCA_BE_DL = edca_setting_DL_GMode[iot_peer];
> > } else if ((iot_peer == HT_IOT_PEER_AIRGO) &&
> > - ((wirelessmode == ODM_WM_G) ||
> > - (wirelessmode == ODM_WM_A))) {
> > + (wirelessmode == ODM_WM_G)) {
> > EDCA_BE_DL = 0xa630;
> > } else if (iot_peer == HT_IOT_PEER_MARVELL) {
> > EDCA_BE_DL = edca_setting_DL[iot_peer];
> > diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
> > index 3738727feb60..a07a6dacec42 100644
> > --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
> > +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
> > @@ -512,8 +512,6 @@ static void _InitOperationMode(struct adapter *padapter)
> > case WIRELESS_MODE_B:
> > regBwOpMode = BW_OPMODE_20MHZ;
> > break;
> > - case WIRELESS_MODE_A:
> > - break;
> > case WIRELESS_MODE_G:
> > regBwOpMode = BW_OPMODE_20MHZ;
> > break;
> > @@ -525,9 +523,6 @@ static void _InitOperationMode(struct adapter *padapter)
> > /* CCK rate will be filtered out only when associated AP does not support it. */
> > regBwOpMode = BW_OPMODE_20MHZ;
> > break;
> > - case WIRELESS_MODE_N_5G:
> > - regBwOpMode = BW_OPMODE_5G;
> > - break;
> >
> > default: /* for MacOSX compiler warning. */
> > break;
> > diff --git a/drivers/staging/rtl8723bs/include/hal_phy.h b/drivers/staging/rtl8723bs/include/hal_phy.h
> > index 19221289b8ce..6417d1b758d2 100644
> > --- a/drivers/staging/rtl8723bs/include/hal_phy.h
> > +++ b/drivers/staging/rtl8723bs/include/hal_phy.h
> > @@ -51,13 +51,10 @@ enum rf_path {
> >
> > enum wireless_mode {
> > WIRELESS_MODE_UNKNOWN = 0x00,
> > - WIRELESS_MODE_A = 0x01,
> > WIRELESS_MODE_B = 0x02,
> > WIRELESS_MODE_G = 0x04,
> > WIRELESS_MODE_AUTO = 0x08,
> > WIRELESS_MODE_N_24G = 0x10,
> > - WIRELESS_MODE_N_5G = 0x20,
> > - WIRELESS_MODE_AC_5G = 0x40,
> > WIRELESS_MODE_AC_24G = 0x80,
> > WIRELESS_MODE_AC_ONLY = 0x100,
> > };
> > diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
> > index 6540c7a22938..ac88bd30b097 100644
> > --- a/drivers/staging/rtl8723bs/include/ieee80211.h
> > +++ b/drivers/staging/rtl8723bs/include/ieee80211.h
> > @@ -144,33 +144,20 @@ enum network_type {
> > /* Sub-Element */
> > WIRELESS_11B = BIT(0), /* tx: cck only , rx: cck only, hw: cck */
> > WIRELESS_11G = BIT(1), /* tx: ofdm only, rx: ofdm & cck, hw: cck & ofdm */
> > - WIRELESS_11A = BIT(2), /* tx: ofdm only, rx: ofdm only, hw: ofdm only */
> > WIRELESS_11_24N = BIT(3), /* tx: MCS only, rx: MCS & cck, hw: MCS & cck */
> > - WIRELESS_11_5N = BIT(4), /* tx: MCS only, rx: MCS & ofdm, hw: ofdm only */
> > WIRELESS_AUTO = BIT(5),
> > - WIRELESS_11AC = BIT(6),
> >
> > /* Combination */
> > /* Type for current wireless mode */
> > WIRELESS_11BG = (WIRELESS_11B|WIRELESS_11G), /* tx: cck & ofdm, rx: cck & ofdm & MCS, hw: cck & ofdm */
> > WIRELESS_11G_24N = (WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & MCS, rx: ofdm & cck & MCS, hw: cck & ofdm */
> > - WIRELESS_11A_5N = (WIRELESS_11A|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
> > WIRELESS_11B_24N = (WIRELESS_11B|WIRELESS_11_24N), /* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */
> > WIRELESS_11BG_24N = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N), /* tx: ofdm & cck & MCS, rx: ofdm & cck & MCS, hw: ofdm & cck */
> > - WIRELESS_11_24AC = (WIRELESS_11G|WIRELESS_11AC),
> > - WIRELESS_11_5AC = (WIRELESS_11A|WIRELESS_11AC),
> > -
> > -
> > - /* Type for registry default wireless mode */
> > - WIRELESS_11AGN = (WIRELESS_11A|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N), /* tx: ofdm & MCS, rx: ofdm & MCS, hw: ofdm only */
> > - WIRELESS_11ABGN = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N),
> > - WIRELESS_MODE_24G = (WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11AC),
> > - WIRELESS_MODE_MAX = (WIRELESS_11A|WIRELESS_11B|WIRELESS_11G|WIRELESS_11_24N|WIRELESS_11_5N|WIRELESS_11AC),
> > };
> >
> > #define SUPPORTED_24G_NETTYPE_MSK (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N)
> >
> > -#define IsLegacyOnly(NetType) ((NetType) == ((NetType) & (WIRELESS_11BG|WIRELESS_11A)))
> > +#define IsLegacyOnly(NetType) ((NetType) == ((NetType) & (WIRELESS_11BG)))
> >
> > #define IsSupported24G(NetType) ((NetType) & SUPPORTED_24G_NETTYPE_MSK ? true : false)
> >
> > @@ -182,11 +169,8 @@ enum network_type {
> > #define IsSupportedRxHT(NetType) IsEnableHWOFDM(NetType)
> >
> > #define IsSupportedTxCCK(NetType) (((NetType) & (WIRELESS_11B)) ? true : false)
> > -#define IsSupportedTxOFDM(NetType) (((NetType) & (WIRELESS_11G|WIRELESS_11A)) ? true : false)
> > -#define IsSupportedHT(NetType) (((NetType) & (WIRELESS_11_24N|WIRELESS_11_5N)) ? true : false)
> > -
> > -#define IsSupportedVHT(NetType) (((NetType) & (WIRELESS_11AC)) ? true : false)
> > -
> > +#define IsSupportedTxOFDM(NetType) (((NetType) & (WIRELESS_11G) ? true : false)
> > +#define IsSupportedHT(NetType) (((NetType) & (WIRELESS_11_24N)) ? true : false)
> >
> > struct ieee_param {
> > u32 cmd;
> > diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h
> > index 23de3ab87f9c..0bd7b662b972 100644
> > --- a/drivers/staging/rtl8723bs/include/wifi.h
> > +++ b/drivers/staging/rtl8723bs/include/wifi.h
> > @@ -336,7 +336,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)
> > #define _PRE_ALLOCICVHDR_ 5
> > #define _PRE_ALLOCMICHDR_ 6
> >
> > -#define _SIFSTIME_ ((priv->pmib->dot11BssType.net_work_type&WIRELESS_11A)?16:10)
> > #define _ACKCTSLNG_ 14 /* 14 bytes long, including crclng */
> > #define _CRCLNG_ 4
> >
> > diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> > index 11b9a5919da4..4e7c115c8bc1 100644
> > --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> > +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> > @@ -22,7 +22,7 @@ static int rtw_lbkmode;/* RTL8712_AIR_TRX; */
> > static int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure;infra, ad-hoc, auto */
> > /* struct ndis_802_11_ssid ssid; */
> > static int rtw_channel = 1;/* ad-hoc support requirement */
> > -static int rtw_wireless_mode = WIRELESS_MODE_MAX;
> > +static int rtw_wireless_mode = WIRELESS_11BG_24N;
> > static int rtw_vrtl_carrier_sense = AUTO_VCS;
> > static int rtw_vcs_type = RTS_CTS;/* */
> > static int rtw_rts_thresh = 2347;/* */
> >
>
On Mon, Jun 21, 2021 at 11:45:39AM +0200, Hans de Goede wrote:
> Hi,
>
> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> > remove VHT dead code, as the device doesn't support
> > VHT (which is a 802.11ac capability).
> >
> > Signed-off-by: Fabio Aiuto <[email protected]>
> > ---
> > drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
> > drivers/staging/rtl8723bs/hal/hal_com.c | 241 -----------
> > .../staging/rtl8723bs/hal/hal_com_phycfg.c | 383 +-----------------
> > drivers/staging/rtl8723bs/include/hal_com.h | 62 +--
> > .../rtl8723bs/include/hal_com_phycfg.h | 4 -
> > drivers/staging/rtl8723bs/include/ieee80211.h | 45 --
> > .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
> > drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
> > 8 files changed, 9 insertions(+), 752 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > index 285acd3d843b..c128d462c6c7 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > @@ -46,7 +46,6 @@ static struct action_handler OnAction_tbl[] = {
> > {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved},
> > {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved},
> > {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved},
> > - {RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &DoReserved},
> > {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved},
> > };
> >
> > diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
> > index 7a88447f8294..eebd48438733 100644
> > --- a/drivers/staging/rtl8723bs/hal/hal_com.c
> > +++ b/drivers/staging/rtl8723bs/hal/hal_com.c
> > @@ -295,126 +295,6 @@ u8 MRateToHwRate(u8 rate)
> > case MGN_MCS31:
> > ret = DESC_RATEMCS31;
> > break;
> > - case MGN_VHT1SS_MCS0:
> > - ret = DESC_RATEVHTSS1MCS0;
> > - break;
> > - case MGN_VHT1SS_MCS1:
> > - ret = DESC_RATEVHTSS1MCS1;
> > - break;
> > - case MGN_VHT1SS_MCS2:
> > - ret = DESC_RATEVHTSS1MCS2;
> > - break;
> > - case MGN_VHT1SS_MCS3:
> > - ret = DESC_RATEVHTSS1MCS3;
> > - break;
> > - case MGN_VHT1SS_MCS4:
> > - ret = DESC_RATEVHTSS1MCS4;
> > - break;
> > - case MGN_VHT1SS_MCS5:
> > - ret = DESC_RATEVHTSS1MCS5;
> > - break;
> > - case MGN_VHT1SS_MCS6:
> > - ret = DESC_RATEVHTSS1MCS6;
> > - break;
> > - case MGN_VHT1SS_MCS7:
> > - ret = DESC_RATEVHTSS1MCS7;
> > - break;
> > - case MGN_VHT1SS_MCS8:
> > - ret = DESC_RATEVHTSS1MCS8;
> > - break;
> > - case MGN_VHT1SS_MCS9:
> > - ret = DESC_RATEVHTSS1MCS9;
> > - break;
> > - case MGN_VHT2SS_MCS0:
> > - ret = DESC_RATEVHTSS2MCS0;
> > - break;
> > - case MGN_VHT2SS_MCS1:
> > - ret = DESC_RATEVHTSS2MCS1;
> > - break;
> > - case MGN_VHT2SS_MCS2:
> > - ret = DESC_RATEVHTSS2MCS2;
> > - break;
> > - case MGN_VHT2SS_MCS3:
> > - ret = DESC_RATEVHTSS2MCS3;
> > - break;
> > - case MGN_VHT2SS_MCS4:
> > - ret = DESC_RATEVHTSS2MCS4;
> > - break;
> > - case MGN_VHT2SS_MCS5:
> > - ret = DESC_RATEVHTSS2MCS5;
> > - break;
> > - case MGN_VHT2SS_MCS6:
> > - ret = DESC_RATEVHTSS2MCS6;
> > - break;
> > - case MGN_VHT2SS_MCS7:
> > - ret = DESC_RATEVHTSS2MCS7;
> > - break;
> > - case MGN_VHT2SS_MCS8:
> > - ret = DESC_RATEVHTSS2MCS8;
> > - break;
> > - case MGN_VHT2SS_MCS9:
> > - ret = DESC_RATEVHTSS2MCS9;
> > - break;
> > - case MGN_VHT3SS_MCS0:
> > - ret = DESC_RATEVHTSS3MCS0;
> > - break;
> > - case MGN_VHT3SS_MCS1:
> > - ret = DESC_RATEVHTSS3MCS1;
> > - break;
> > - case MGN_VHT3SS_MCS2:
> > - ret = DESC_RATEVHTSS3MCS2;
> > - break;
> > - case MGN_VHT3SS_MCS3:
> > - ret = DESC_RATEVHTSS3MCS3;
> > - break;
> > - case MGN_VHT3SS_MCS4:
> > - ret = DESC_RATEVHTSS3MCS4;
> > - break;
> > - case MGN_VHT3SS_MCS5:
> > - ret = DESC_RATEVHTSS3MCS5;
> > - break;
> > - case MGN_VHT3SS_MCS6:
> > - ret = DESC_RATEVHTSS3MCS6;
> > - break;
> > - case MGN_VHT3SS_MCS7:
> > - ret = DESC_RATEVHTSS3MCS7;
> > - break;
> > - case MGN_VHT3SS_MCS8:
> > - ret = DESC_RATEVHTSS3MCS8;
> > - break;
> > - case MGN_VHT3SS_MCS9:
> > - ret = DESC_RATEVHTSS3MCS9;
> > - break;
> > - case MGN_VHT4SS_MCS0:
> > - ret = DESC_RATEVHTSS4MCS0;
> > - break;
> > - case MGN_VHT4SS_MCS1:
> > - ret = DESC_RATEVHTSS4MCS1;
> > - break;
> > - case MGN_VHT4SS_MCS2:
> > - ret = DESC_RATEVHTSS4MCS2;
> > - break;
> > - case MGN_VHT4SS_MCS3:
> > - ret = DESC_RATEVHTSS4MCS3;
> > - break;
> > - case MGN_VHT4SS_MCS4:
> > - ret = DESC_RATEVHTSS4MCS4;
> > - break;
> > - case MGN_VHT4SS_MCS5:
> > - ret = DESC_RATEVHTSS4MCS5;
> > - break;
> > - case MGN_VHT4SS_MCS6:
> > - ret = DESC_RATEVHTSS4MCS6;
> > - break;
> > - case MGN_VHT4SS_MCS7:
> > - ret = DESC_RATEVHTSS4MCS7;
> > - break;
> > - case MGN_VHT4SS_MCS8:
> > - ret = DESC_RATEVHTSS4MCS8;
> > - break;
> > - case MGN_VHT4SS_MCS9:
> > - ret = DESC_RATEVHTSS4MCS9;
> > - break;
> > default:
> > break;
> > }
> > @@ -559,127 +439,6 @@ u8 HwRateToMRate(u8 rate)
> > case DESC_RATEMCS31:
> > ret_rate = MGN_MCS31;
> > break;
> > - case DESC_RATEVHTSS1MCS0:
> > - ret_rate = MGN_VHT1SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS1MCS1:
> > - ret_rate = MGN_VHT1SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS1MCS2:
> > - ret_rate = MGN_VHT1SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS1MCS3:
> > - ret_rate = MGN_VHT1SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS1MCS4:
> > - ret_rate = MGN_VHT1SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS1MCS5:
> > - ret_rate = MGN_VHT1SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS1MCS6:
> > - ret_rate = MGN_VHT1SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS1MCS7:
> > - ret_rate = MGN_VHT1SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS1MCS8:
> > - ret_rate = MGN_VHT1SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS1MCS9:
> > - ret_rate = MGN_VHT1SS_MCS9;
> > - break;
> > - case DESC_RATEVHTSS2MCS0:
> > - ret_rate = MGN_VHT2SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS2MCS1:
> > - ret_rate = MGN_VHT2SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS2MCS2:
> > - ret_rate = MGN_VHT2SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS2MCS3:
> > - ret_rate = MGN_VHT2SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS2MCS4:
> > - ret_rate = MGN_VHT2SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS2MCS5:
> > - ret_rate = MGN_VHT2SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS2MCS6:
> > - ret_rate = MGN_VHT2SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS2MCS7:
> > - ret_rate = MGN_VHT2SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS2MCS8:
> > - ret_rate = MGN_VHT2SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS2MCS9:
> > - ret_rate = MGN_VHT2SS_MCS9;
> > - break;
> > - case DESC_RATEVHTSS3MCS0:
> > - ret_rate = MGN_VHT3SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS3MCS1:
> > - ret_rate = MGN_VHT3SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS3MCS2:
> > - ret_rate = MGN_VHT3SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS3MCS3:
> > - ret_rate = MGN_VHT3SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS3MCS4:
> > - ret_rate = MGN_VHT3SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS3MCS5:
> > - ret_rate = MGN_VHT3SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS3MCS6:
> > - ret_rate = MGN_VHT3SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS3MCS7:
> > - ret_rate = MGN_VHT3SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS3MCS8:
> > - ret_rate = MGN_VHT3SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS3MCS9:
> > - ret_rate = MGN_VHT3SS_MCS9;
> > - break;
> > - case DESC_RATEVHTSS4MCS0:
> > - ret_rate = MGN_VHT4SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS4MCS1:
> > - ret_rate = MGN_VHT4SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS4MCS2:
> > - ret_rate = MGN_VHT4SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS4MCS3:
> > - ret_rate = MGN_VHT4SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS4MCS4:
> > - ret_rate = MGN_VHT4SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS4MCS5:
> > - ret_rate = MGN_VHT4SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS4MCS6:
> > - ret_rate = MGN_VHT4SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS4MCS7:
> > - ret_rate = MGN_VHT4SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS4MCS8:
> > - ret_rate = MGN_VHT4SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS4MCS9:
> > - ret_rate = MGN_VHT4SS_MCS9;
> > - break;
> > -
> > default:
> > break;
> > }
> > diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> > index 395eb3b5af71..bb7941aee0c4 100644
> > --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> > +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> > @@ -39,18 +39,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
> > case HT_MCS24_MCS31:
> > value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
> > break;
> > - case VHT_1SSMCS0_1SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
> > - break;
> > - case VHT_2SSMCS0_2SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
> > - break;
> > - case VHT_3SSMCS0_3SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
> > - break;
> > - case VHT_4SSMCS0_4SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
> > - break;
> > default:
> > break;
> > }
> > @@ -91,18 +79,6 @@ phy_SetTxPowerByRateBase(
> > case HT_MCS24_MCS31:
> > pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
> > break;
> > - case VHT_1SSMCS0_1SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
> > - break;
> > - case VHT_2SSMCS0_2SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
> > - break;
> > - case VHT_3SSMCS0_3SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
> > - break;
> > - case VHT_4SSMCS0_4SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
> > - break;
> > default:
> > break;
> > }
> > @@ -131,14 +107,6 @@ struct adapter *padapter
> > base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
> > phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
> >
> > - base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
> > - phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
> > -
> > - base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
> > - phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
> > -
> > - base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
> > - phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
>
> You are removing a bunch of register writes from a block here, while keeping others,
> so this does not seem like it is just dead-code removal it feels like you are
> actually making a functional change.
You are right, I will fix the changelog in next v2.
>
> Perhaps this entire block can never be executed ?
It think it's executed during hal initialization
>
> Or maybe the VHT name used here is misleading and this is also relevant for 2.4 GHZ
> 40Mhz use ? Did you test with an access point configured to use 40 MHz channels
> and then checked that you were actually using a 40MHz channel ? Note these are
> quite rare AFAIK because 40 MHz tends to cause even more collosion issues in the
> already quite full 2.4G spectrum, still if possible you should test this and make
> sure that it does not regress (with out specifically testing this we might not
> note regressions for a long time because of 40MHz usage being rare).
>
The MCS section involved is from 0 to 9 in a set of up to 4 spatial streams,
but rtl8723bs works only with 0-7 and 32 MCS rates in both 20 and 40 Mhz
and multiple spatial streams are not supported.
So setting something like VHT_{1,2,3}SSMCS0_{1,2,3}SSMCS9 in our case does
something odd.
Nonetheless testing with a 40 Mhz channel would be great, but with a
bit of shame I admit that I don't know how to set my phone hotspot to
work on a 40 Mhz bandwidth... (It' the only thing I have).
Maybe some could help me...
thank you
>
>
>
> > }
> > }
> >
> > @@ -442,81 +410,6 @@ PHY_GetRateValuesOfTxPowerByRate(
> > *RateNum = 4;
> > break;
> >
> > - case 0xC3C:
> > - case 0xE3C:
> > - case 0x183C:
> > - case 0x1a3C:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS0);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS1);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS2);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS3);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC40:
> > - case 0xE40:
> > - case 0x1840:
> > - case 0x1a40:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS4);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS5);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS6);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS7);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC44:
> > - case 0xE44:
> > - case 0x1844:
> > - case 0x1a44:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS8);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS9);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC48:
> > - case 0xE48:
> > - case 0x1848:
> > - case 0x1a48:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS2);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS3);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS4);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS5);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC4C:
> > - case 0xE4C:
> > - case 0x184C:
> > - case 0x1a4C:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS6);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS7);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS8);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS9);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > case 0xCD8:
> > case 0xED8:
> > case 0x18D8:
> > @@ -547,49 +440,6 @@ PHY_GetRateValuesOfTxPowerByRate(
> > *RateNum = 4;
> > break;
> >
> > - case 0xCE0:
> > - case 0xEE0:
> > - case 0x18E0:
> > - case 0x1aE0:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS0);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS1);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS2);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS3);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xCE4:
> > - case 0xEE4:
> > - case 0x18E4:
> > - case 0x1aE4:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS4);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS5);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS6);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS7);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xCE8:
> > - case 0xEE8:
> > - case 0x18E8:
> > - case 0x1aE8:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS8);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS9);
> > - for (i = 0; i < 2; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
>
> Here only 2 rates are set, so this feels like it is a 40MHz case, are you
> sure this can be removed (maybe it is 40MHz channel use at 5GHz ?
>
> The rest of the patch looks ok.
>
> Regards,
>
> Hans
same as above, MCS indexes invlolved seems not to be supported...
>
>
>
>
> > default:
> > break;
> > }
> > @@ -617,10 +467,6 @@ static void PHY_StoreTxPowerByRateNew(
> > return;
> >
> > for (i = 0; i < rateNum; ++i) {
> > - if (rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0) ||
> > - rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1))
> > - TxNum = RF_2TX;
> > -
> > pHalData->TxPwrByRateOffset[RfPath][TxNum][rateIndex[i]] = PwrByRateVal[i];
> > }
> > }
> > @@ -691,18 +537,6 @@ struct adapter *padapter
> > u8 mcs16_23Rates[8] = {
> > MGN_MCS16, MGN_MCS17, MGN_MCS18, MGN_MCS19, MGN_MCS20, MGN_MCS21, MGN_MCS22, MGN_MCS23
> > };
> > - u8 vht1ssRates[10] = {
> > - MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
> > - MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9
> > - };
> > - u8 vht2ssRates[10] = {
> > - MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
> > - MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9
> > - };
> > - u8 vht3ssRates[10] = {
> > - MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
> > - MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9
> > - };
> >
> > for (path = ODM_RF_PATH_A; path <= ODM_RF_PATH_D; ++path) {
> > for (txNum = RF_1TX; txNum < RF_MAX_TX_NUM; ++txNum) {
> > @@ -740,27 +574,6 @@ struct adapter *padapter
> > value = PHY_GetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i]);
> > PHY_SetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i], value - base);
> > }
> > -
> > - /* VHT 1SS */
> > - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT1SS_MCS7);
> > - for (i = 0; i < sizeof(vht1ssRates); ++i) {
> > - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht1ssRates[i]);
> > - PHY_SetTxPowerByRate(padapter, path, txNum, vht1ssRates[i], value - base);
> > - }
> > -
> > - /* VHT 2SS */
> > - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT2SS_MCS7);
> > - for (i = 0; i < sizeof(vht2ssRates); ++i) {
> > - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht2ssRates[i]);
> > - PHY_SetTxPowerByRate(padapter, path, txNum, vht2ssRates[i], value - base);
> > - }
> > -
> > - /* VHT 3SS */
> > - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT3SS_MCS7);
> > - for (i = 0; i < sizeof(vht3ssRates); ++i) {
> > - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht3ssRates[i]);
> > - PHY_SetTxPowerByRate(padapter, path, txNum, vht3ssRates[i], value - base);
> > - }
> > }
> > }
> > }
> > @@ -823,38 +636,6 @@ void PHY_SetTxPowerIndexByRateSection(
> > Channel, htRates4T,
> > ARRAY_SIZE(htRates4T));
> >
> > - } else if (RateSection == VHT_1SSMCS0_1SSMCS9) {
> > - u8 vhtRates1T[] = {MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
> > - MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9};
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates1T,
> > - ARRAY_SIZE(vhtRates1T));
> > -
> > - } else if (RateSection == VHT_2SSMCS0_2SSMCS9) {
> > - u8 vhtRates2T[] = {MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
> > - MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9};
> > -
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates2T,
> > - ARRAY_SIZE(vhtRates2T));
> > - } else if (RateSection == VHT_3SSMCS0_3SSMCS9) {
> > - u8 vhtRates3T[] = {MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
> > - MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9};
> > -
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates3T,
> > - ARRAY_SIZE(vhtRates3T));
> > - } else if (RateSection == VHT_4SSMCS0_4SSMCS9) {
> > - u8 vhtRates4T[] = {MGN_VHT4SS_MCS0, MGN_VHT4SS_MCS1, MGN_VHT4SS_MCS2, MGN_VHT4SS_MCS3, MGN_VHT4SS_MCS4,
> > - MGN_VHT4SS_MCS5, MGN_VHT4SS_MCS6, MGN_VHT4SS_MCS7, MGN_VHT4SS_MCS8, MGN_VHT4SS_MCS9};
> > -
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates4T,
> > - ARRAY_SIZE(vhtRates4T));
> > }
> > }
> >
> > @@ -883,23 +664,23 @@ u8 PHY_GetTxPowerIndexBase(
> > txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S];
> >
> > if (BandWidth == CHANNEL_WIDTH_20) { /* BW20-1S, BW20-2S */
> > - if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
> > - if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_2S];
> > - if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_3S];
> > - if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_4S];
> >
> > } else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */
> > - if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
> > - if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S];
> > - if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S];
> > - if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
> >
> > }
> > @@ -1060,126 +841,6 @@ u8 PHY_GetRateIndexOfTxPowerByRate(u8 Rate)
> > case MGN_MCS31:
> > index = 43;
> > break;
> > - case MGN_VHT1SS_MCS0:
> > - index = 44;
> > - break;
> > - case MGN_VHT1SS_MCS1:
> > - index = 45;
> > - break;
> > - case MGN_VHT1SS_MCS2:
> > - index = 46;
> > - break;
> > - case MGN_VHT1SS_MCS3:
> > - index = 47;
> > - break;
> > - case MGN_VHT1SS_MCS4:
> > - index = 48;
> > - break;
> > - case MGN_VHT1SS_MCS5:
> > - index = 49;
> > - break;
> > - case MGN_VHT1SS_MCS6:
> > - index = 50;
> > - break;
> > - case MGN_VHT1SS_MCS7:
> > - index = 51;
> > - break;
> > - case MGN_VHT1SS_MCS8:
> > - index = 52;
> > - break;
> > - case MGN_VHT1SS_MCS9:
> > - index = 53;
> > - break;
> > - case MGN_VHT2SS_MCS0:
> > - index = 54;
> > - break;
> > - case MGN_VHT2SS_MCS1:
> > - index = 55;
> > - break;
> > - case MGN_VHT2SS_MCS2:
> > - index = 56;
> > - break;
> > - case MGN_VHT2SS_MCS3:
> > - index = 57;
> > - break;
> > - case MGN_VHT2SS_MCS4:
> > - index = 58;
> > - break;
> > - case MGN_VHT2SS_MCS5:
> > - index = 59;
> > - break;
> > - case MGN_VHT2SS_MCS6:
> > - index = 60;
> > - break;
> > - case MGN_VHT2SS_MCS7:
> > - index = 61;
> > - break;
> > - case MGN_VHT2SS_MCS8:
> > - index = 62;
> > - break;
> > - case MGN_VHT2SS_MCS9:
> > - index = 63;
> > - break;
> > - case MGN_VHT3SS_MCS0:
> > - index = 64;
> > - break;
> > - case MGN_VHT3SS_MCS1:
> > - index = 65;
> > - break;
> > - case MGN_VHT3SS_MCS2:
> > - index = 66;
> > - break;
> > - case MGN_VHT3SS_MCS3:
> > - index = 67;
> > - break;
> > - case MGN_VHT3SS_MCS4:
> > - index = 68;
> > - break;
> > - case MGN_VHT3SS_MCS5:
> > - index = 69;
> > - break;
> > - case MGN_VHT3SS_MCS6:
> > - index = 70;
> > - break;
> > - case MGN_VHT3SS_MCS7:
> > - index = 71;
> > - break;
> > - case MGN_VHT3SS_MCS8:
> > - index = 72;
> > - break;
> > - case MGN_VHT3SS_MCS9:
> > - index = 73;
> > - break;
> > - case MGN_VHT4SS_MCS0:
> > - index = 74;
> > - break;
> > - case MGN_VHT4SS_MCS1:
> > - index = 75;
> > - break;
> > - case MGN_VHT4SS_MCS2:
> > - index = 76;
> > - break;
> > - case MGN_VHT4SS_MCS3:
> > - index = 77;
> > - break;
> > - case MGN_VHT4SS_MCS4:
> > - index = 78;
> > - break;
> > - case MGN_VHT4SS_MCS5:
> > - index = 79;
> > - break;
> > - case MGN_VHT4SS_MCS6:
> > - index = 80;
> > - break;
> > - case MGN_VHT4SS_MCS7:
> > - index = 81;
> > - break;
> > - case MGN_VHT4SS_MCS8:
> > - index = 82;
> > - break;
> > - case MGN_VHT4SS_MCS9:
> > - index = 83;
> > - break;
> > default:
> > break;
> > }
> > @@ -1319,26 +980,6 @@ static s16 get_rate_sctn_idx(const u8 rate)
> > case MGN_MCS24: case MGN_MCS25: case MGN_MCS26: case MGN_MCS27:
> > case MGN_MCS28: case MGN_MCS29: case MGN_MCS30: case MGN_MCS31:
> > return 5;
> > - case MGN_VHT1SS_MCS0: case MGN_VHT1SS_MCS1: case MGN_VHT1SS_MCS2:
> > - case MGN_VHT1SS_MCS3: case MGN_VHT1SS_MCS4: case MGN_VHT1SS_MCS5:
> > - case MGN_VHT1SS_MCS6: case MGN_VHT1SS_MCS7: case MGN_VHT1SS_MCS8:
> > - case MGN_VHT1SS_MCS9:
> > - return 6;
> > - case MGN_VHT2SS_MCS0: case MGN_VHT2SS_MCS1: case MGN_VHT2SS_MCS2:
> > - case MGN_VHT2SS_MCS3: case MGN_VHT2SS_MCS4: case MGN_VHT2SS_MCS5:
> > - case MGN_VHT2SS_MCS6: case MGN_VHT2SS_MCS7: case MGN_VHT2SS_MCS8:
> > - case MGN_VHT2SS_MCS9:
> > - return 7;
> > - case MGN_VHT3SS_MCS0: case MGN_VHT3SS_MCS1: case MGN_VHT3SS_MCS2:
> > - case MGN_VHT3SS_MCS3: case MGN_VHT3SS_MCS4: case MGN_VHT3SS_MCS5:
> > - case MGN_VHT3SS_MCS6: case MGN_VHT3SS_MCS7: case MGN_VHT3SS_MCS8:
> > - case MGN_VHT3SS_MCS9:
> > - return 8;
> > - case MGN_VHT4SS_MCS0: case MGN_VHT4SS_MCS1: case MGN_VHT4SS_MCS2:
> > - case MGN_VHT4SS_MCS3: case MGN_VHT4SS_MCS4: case MGN_VHT4SS_MCS5:
> > - case MGN_VHT4SS_MCS6: case MGN_VHT4SS_MCS7: case MGN_VHT4SS_MCS8:
> > - case MGN_VHT4SS_MCS9:
> > - return 9;
> > default:
> > return -1;
> > }
> > @@ -1510,14 +1151,6 @@ void PHY_SetTxPowerLimit(
> > rateSection = 4;
> > else if (eqNByte(RateSection, (u8 *)("HT"), 2) && eqNByte(RfPath, (u8 *)("4T"), 2))
> > rateSection = 5;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("1T"), 2))
> > - rateSection = 6;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("2T"), 2))
> > - rateSection = 7;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("3T"), 2))
> > - rateSection = 8;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("4T"), 2))
> > - rateSection = 9;
> > else
> > return;
> >
> > diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
> > index 6bcc443d59fb..1bc332261b2a 100644
> > --- a/drivers/staging/rtl8723bs/include/hal_com.h
> > +++ b/drivers/staging/rtl8723bs/include/hal_com.h
> > @@ -69,46 +69,6 @@
> > #define DESC_RATEMCS29 0x29
> > #define DESC_RATEMCS30 0x2A
> > #define DESC_RATEMCS31 0x2B
> > -#define DESC_RATEVHTSS1MCS0 0x2C
> > -#define DESC_RATEVHTSS1MCS1 0x2D
> > -#define DESC_RATEVHTSS1MCS2 0x2E
> > -#define DESC_RATEVHTSS1MCS3 0x2F
> > -#define DESC_RATEVHTSS1MCS4 0x30
> > -#define DESC_RATEVHTSS1MCS5 0x31
> > -#define DESC_RATEVHTSS1MCS6 0x32
> > -#define DESC_RATEVHTSS1MCS7 0x33
> > -#define DESC_RATEVHTSS1MCS8 0x34
> > -#define DESC_RATEVHTSS1MCS9 0x35
> > -#define DESC_RATEVHTSS2MCS0 0x36
> > -#define DESC_RATEVHTSS2MCS1 0x37
> > -#define DESC_RATEVHTSS2MCS2 0x38
> > -#define DESC_RATEVHTSS2MCS3 0x39
> > -#define DESC_RATEVHTSS2MCS4 0x3A
> > -#define DESC_RATEVHTSS2MCS5 0x3B
> > -#define DESC_RATEVHTSS2MCS6 0x3C
> > -#define DESC_RATEVHTSS2MCS7 0x3D
> > -#define DESC_RATEVHTSS2MCS8 0x3E
> > -#define DESC_RATEVHTSS2MCS9 0x3F
> > -#define DESC_RATEVHTSS3MCS0 0x40
> > -#define DESC_RATEVHTSS3MCS1 0x41
> > -#define DESC_RATEVHTSS3MCS2 0x42
> > -#define DESC_RATEVHTSS3MCS3 0x43
> > -#define DESC_RATEVHTSS3MCS4 0x44
> > -#define DESC_RATEVHTSS3MCS5 0x45
> > -#define DESC_RATEVHTSS3MCS6 0x46
> > -#define DESC_RATEVHTSS3MCS7 0x47
> > -#define DESC_RATEVHTSS3MCS8 0x48
> > -#define DESC_RATEVHTSS3MCS9 0x49
> > -#define DESC_RATEVHTSS4MCS0 0x4A
> > -#define DESC_RATEVHTSS4MCS1 0x4B
> > -#define DESC_RATEVHTSS4MCS2 0x4C
> > -#define DESC_RATEVHTSS4MCS3 0x4D
> > -#define DESC_RATEVHTSS4MCS4 0x4E
> > -#define DESC_RATEVHTSS4MCS5 0x4F
> > -#define DESC_RATEVHTSS4MCS6 0x50
> > -#define DESC_RATEVHTSS4MCS7 0x51
> > -#define DESC_RATEVHTSS4MCS8 0x52
> > -#define DESC_RATEVHTSS4MCS9 0x53
> >
> > #define HDATA_RATE(rate)\
> > (rate == DESC_RATE1M) ? "CCK_1M" : \
> > @@ -138,27 +98,7 @@
> > (rate == DESC_RATEMCS12) ? "MCS12" : \
> > (rate == DESC_RATEMCS13) ? "MCS13" : \
> > (rate == DESC_RATEMCS14) ? "MCS14" : \
> > -(rate == DESC_RATEMCS15) ? "MCS15" : \
> > -(rate == DESC_RATEVHTSS1MCS0) ? "VHTSS1MCS0" : \
> > -(rate == DESC_RATEVHTSS1MCS1) ? "VHTSS1MCS1" : \
> > -(rate == DESC_RATEVHTSS1MCS2) ? "VHTSS1MCS2" : \
> > -(rate == DESC_RATEVHTSS1MCS3) ? "VHTSS1MCS3" : \
> > -(rate == DESC_RATEVHTSS1MCS4) ? "VHTSS1MCS4" : \
> > -(rate == DESC_RATEVHTSS1MCS5) ? "VHTSS1MCS5" : \
> > -(rate == DESC_RATEVHTSS1MCS6) ? "VHTSS1MCS6" : \
> > -(rate == DESC_RATEVHTSS1MCS7) ? "VHTSS1MCS7" : \
> > -(rate == DESC_RATEVHTSS1MCS8) ? "VHTSS1MCS8" : \
> > -(rate == DESC_RATEVHTSS1MCS9) ? "VHTSS1MCS9" : \
> > -(rate == DESC_RATEVHTSS2MCS0) ? "VHTSS2MCS0" : \
> > -(rate == DESC_RATEVHTSS2MCS1) ? "VHTSS2MCS1" : \
> > -(rate == DESC_RATEVHTSS2MCS2) ? "VHTSS2MCS2" : \
> > -(rate == DESC_RATEVHTSS2MCS3) ? "VHTSS2MCS3" : \
> > -(rate == DESC_RATEVHTSS2MCS4) ? "VHTSS2MCS4" : \
> > -(rate == DESC_RATEVHTSS2MCS5) ? "VHTSS2MCS5" : \
> > -(rate == DESC_RATEVHTSS2MCS6) ? "VHTSS2MCS6" : \
> > -(rate == DESC_RATEVHTSS2MCS7) ? "VHTSS2MCS7" : \
> > -(rate == DESC_RATEVHTSS2MCS8) ? "VHTSS2MCS8" : \
> > -(rate == DESC_RATEVHTSS2MCS9) ? "VHTSS2MCS9" : "UNKNOWN"
> > +(rate == DESC_RATEMCS15) ? "MCS15" : "UNKNOWN"
> >
> >
> > enum{
> > diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> > index 3d95ab1986b1..c966d0e3e5ae 100644
> > --- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> > +++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> > @@ -19,10 +19,6 @@ enum rate_section {
> > HT_MCS8_MCS15,
> > HT_MCS16_MCS23,
> > HT_MCS24_MCS31,
> > - VHT_1SSMCS0_1SSMCS9,
> > - VHT_2SSMCS0_2SSMCS9,
> > - VHT_3SSMCS0_3SSMCS9,
> > - VHT_4SSMCS0_4SSMCS9,
> > };
> >
> > enum {
> > diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
> > index ac88bd30b097..378c21595e05 100644
> > --- a/drivers/staging/rtl8723bs/include/ieee80211.h
> > +++ b/drivers/staging/rtl8723bs/include/ieee80211.h
> > @@ -60,7 +60,6 @@ enum {
> > #define WLAN_STA_HT BIT(11)
> > #define WLAN_STA_WPS BIT(12)
> > #define WLAN_STA_MAYBE_WPS BIT(13)
> > -#define WLAN_STA_VHT BIT(14)
> > #define WLAN_STA_NONERP BIT(31)
> >
> > #define IEEE_CMD_SET_WPA_PARAM 1
> > @@ -135,8 +134,6 @@ enum {
> > RATEID_IDX_BG = 6,
> > RATEID_IDX_G = 7,
> > RATEID_IDX_B = 8,
> > - RATEID_IDX_VHT_2SS = 9,
> > - RATEID_IDX_VHT_1SS = 10,
> > };
> >
> > enum network_type {
> > @@ -424,51 +421,10 @@ enum {
> > MGN_MCS29,
> > MGN_MCS30,
> > MGN_MCS31,
> > - MGN_VHT1SS_MCS0,
> > - MGN_VHT1SS_MCS1,
> > - MGN_VHT1SS_MCS2,
> > - MGN_VHT1SS_MCS3,
> > - MGN_VHT1SS_MCS4,
> > - MGN_VHT1SS_MCS5,
> > - MGN_VHT1SS_MCS6,
> > - MGN_VHT1SS_MCS7,
> > - MGN_VHT1SS_MCS8,
> > - MGN_VHT1SS_MCS9,
> > - MGN_VHT2SS_MCS0,
> > - MGN_VHT2SS_MCS1,
> > - MGN_VHT2SS_MCS2,
> > - MGN_VHT2SS_MCS3,
> > - MGN_VHT2SS_MCS4,
> > - MGN_VHT2SS_MCS5,
> > - MGN_VHT2SS_MCS6,
> > - MGN_VHT2SS_MCS7,
> > - MGN_VHT2SS_MCS8,
> > - MGN_VHT2SS_MCS9,
> > - MGN_VHT3SS_MCS0,
> > - MGN_VHT3SS_MCS1,
> > - MGN_VHT3SS_MCS2,
> > - MGN_VHT3SS_MCS3,
> > - MGN_VHT3SS_MCS4,
> > - MGN_VHT3SS_MCS5,
> > - MGN_VHT3SS_MCS6,
> > - MGN_VHT3SS_MCS7,
> > - MGN_VHT3SS_MCS8,
> > - MGN_VHT3SS_MCS9,
> > - MGN_VHT4SS_MCS0,
> > - MGN_VHT4SS_MCS1,
> > - MGN_VHT4SS_MCS2,
> > - MGN_VHT4SS_MCS3,
> > - MGN_VHT4SS_MCS4,
> > - MGN_VHT4SS_MCS5,
> > - MGN_VHT4SS_MCS6,
> > - MGN_VHT4SS_MCS7,
> > - MGN_VHT4SS_MCS8,
> > - MGN_VHT4SS_MCS9,
> > MGN_UNKNOWN
> > };
> >
> > #define IS_HT_RATE(_rate) (_rate >= MGN_MCS0 && _rate <= MGN_MCS31)
> > -#define IS_VHT_RATE(_rate) (_rate >= MGN_VHT1SS_MCS0 && _rate <= MGN_VHT4SS_MCS9)
> > #define IS_CCK_RATE(_rate) (MGN_1M == _rate || _rate == MGN_2M || _rate == MGN_5_5M || _rate == MGN_11M)
> > #define IS_OFDM_RATE(_rate) (MGN_6M <= _rate && _rate <= MGN_54M && _rate != MGN_11M)
> >
> > @@ -625,7 +581,6 @@ enum {
> > RTW_WLAN_CATEGORY_TDLS = 12,
> > RTW_WLAN_CATEGORY_SELF_PROTECTED = 15, /* add for CONFIG_IEEE80211W, none 11w also can use */
> > RTW_WLAN_CATEGORY_WMM = 17,
> > - RTW_WLAN_CATEGORY_VHT = 21,
> > RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
> > };
> >
> > diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> > index 56bdc14af47d..9dd329a5208a 100644
> > --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> > +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> > @@ -402,27 +402,6 @@ struct txdesc_8723b {
> > #define DESC8723B_RATEMCS13 0x19
> > #define DESC8723B_RATEMCS14 0x1a
> > #define DESC8723B_RATEMCS15 0x1b
> > -#define DESC8723B_RATEVHTSS1MCS0 0x2c
> > -#define DESC8723B_RATEVHTSS1MCS1 0x2d
> > -#define DESC8723B_RATEVHTSS1MCS2 0x2e
> > -#define DESC8723B_RATEVHTSS1MCS3 0x2f
> > -#define DESC8723B_RATEVHTSS1MCS4 0x30
> > -#define DESC8723B_RATEVHTSS1MCS5 0x31
> > -#define DESC8723B_RATEVHTSS1MCS6 0x32
> > -#define DESC8723B_RATEVHTSS1MCS7 0x33
> > -#define DESC8723B_RATEVHTSS1MCS8 0x34
> > -#define DESC8723B_RATEVHTSS1MCS9 0x35
> > -#define DESC8723B_RATEVHTSS2MCS0 0x36
> > -#define DESC8723B_RATEVHTSS2MCS1 0x37
> > -#define DESC8723B_RATEVHTSS2MCS2 0x38
> > -#define DESC8723B_RATEVHTSS2MCS3 0x39
> > -#define DESC8723B_RATEVHTSS2MCS4 0x3a
> > -#define DESC8723B_RATEVHTSS2MCS5 0x3b
> > -#define DESC8723B_RATEVHTSS2MCS6 0x3c
> > -#define DESC8723B_RATEVHTSS2MCS7 0x3d
> > -#define DESC8723B_RATEVHTSS2MCS8 0x3e
> > -#define DESC8723B_RATEVHTSS2MCS9 0x3f
> > -
> >
> > #define RX_HAL_IS_CCK_RATE_8723B(pDesc)\
> > (GET_RX_STATUS_DESC_RX_RATE_8723B(pDesc) == DESC8723B_RATE1M ||\
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_ht.h b/drivers/staging/rtl8723bs/include/rtw_ht.h
> > index e3f353fe1e47..1527d8be2d7a 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_ht.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_ht.h
> > @@ -42,10 +42,6 @@ enum {
> > HT_AGG_SIZE_16K = 1,
> > HT_AGG_SIZE_32K = 2,
> > HT_AGG_SIZE_64K = 3,
> > - VHT_AGG_SIZE_128K = 4,
> > - VHT_AGG_SIZE_256K = 5,
> > - VHT_AGG_SIZE_512K = 6,
> > - VHT_AGG_SIZE_1024K = 7,
> > };
> >
> > enum {
> >
>
thank you,
fabio
Hi,
On 6/21/21 2:41 PM, Fabio Aiuto wrote:
> On Mon, Jun 21, 2021 at 11:45:39AM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
>>> remove VHT dead code, as the device doesn't support
>>> VHT (which is a 802.11ac capability).
>>>
>>> Signed-off-by: Fabio Aiuto <[email protected]>
>>> ---
>>> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
>>> drivers/staging/rtl8723bs/hal/hal_com.c | 241 -----------
>>> .../staging/rtl8723bs/hal/hal_com_phycfg.c | 383 +-----------------
>>> drivers/staging/rtl8723bs/include/hal_com.h | 62 +--
>>> .../rtl8723bs/include/hal_com_phycfg.h | 4 -
>>> drivers/staging/rtl8723bs/include/ieee80211.h | 45 --
>>> .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
>>> drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
>>> 8 files changed, 9 insertions(+), 752 deletions(-)
>>>
>>> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
>>> index 285acd3d843b..c128d462c6c7 100644
>>> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
>>> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
>>> @@ -46,7 +46,6 @@ static struct action_handler OnAction_tbl[] = {
>>> {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved},
>>> {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved},
>>> {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved},
>>> - {RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &DoReserved},
>>> {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved},
>>> };
>>>
>>> diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
>>> index 7a88447f8294..eebd48438733 100644
>>> --- a/drivers/staging/rtl8723bs/hal/hal_com.c
>>> +++ b/drivers/staging/rtl8723bs/hal/hal_com.c
>>> @@ -295,126 +295,6 @@ u8 MRateToHwRate(u8 rate)
>>> case MGN_MCS31:
>>> ret = DESC_RATEMCS31;
>>> break;
>>> - case MGN_VHT1SS_MCS0:
>>> - ret = DESC_RATEVHTSS1MCS0;
>>> - break;
>>> - case MGN_VHT1SS_MCS1:
>>> - ret = DESC_RATEVHTSS1MCS1;
>>> - break;
>>> - case MGN_VHT1SS_MCS2:
>>> - ret = DESC_RATEVHTSS1MCS2;
>>> - break;
>>> - case MGN_VHT1SS_MCS3:
>>> - ret = DESC_RATEVHTSS1MCS3;
>>> - break;
>>> - case MGN_VHT1SS_MCS4:
>>> - ret = DESC_RATEVHTSS1MCS4;
>>> - break;
>>> - case MGN_VHT1SS_MCS5:
>>> - ret = DESC_RATEVHTSS1MCS5;
>>> - break;
>>> - case MGN_VHT1SS_MCS6:
>>> - ret = DESC_RATEVHTSS1MCS6;
>>> - break;
>>> - case MGN_VHT1SS_MCS7:
>>> - ret = DESC_RATEVHTSS1MCS7;
>>> - break;
>>> - case MGN_VHT1SS_MCS8:
>>> - ret = DESC_RATEVHTSS1MCS8;
>>> - break;
>>> - case MGN_VHT1SS_MCS9:
>>> - ret = DESC_RATEVHTSS1MCS9;
>>> - break;
>>> - case MGN_VHT2SS_MCS0:
>>> - ret = DESC_RATEVHTSS2MCS0;
>>> - break;
>>> - case MGN_VHT2SS_MCS1:
>>> - ret = DESC_RATEVHTSS2MCS1;
>>> - break;
>>> - case MGN_VHT2SS_MCS2:
>>> - ret = DESC_RATEVHTSS2MCS2;
>>> - break;
>>> - case MGN_VHT2SS_MCS3:
>>> - ret = DESC_RATEVHTSS2MCS3;
>>> - break;
>>> - case MGN_VHT2SS_MCS4:
>>> - ret = DESC_RATEVHTSS2MCS4;
>>> - break;
>>> - case MGN_VHT2SS_MCS5:
>>> - ret = DESC_RATEVHTSS2MCS5;
>>> - break;
>>> - case MGN_VHT2SS_MCS6:
>>> - ret = DESC_RATEVHTSS2MCS6;
>>> - break;
>>> - case MGN_VHT2SS_MCS7:
>>> - ret = DESC_RATEVHTSS2MCS7;
>>> - break;
>>> - case MGN_VHT2SS_MCS8:
>>> - ret = DESC_RATEVHTSS2MCS8;
>>> - break;
>>> - case MGN_VHT2SS_MCS9:
>>> - ret = DESC_RATEVHTSS2MCS9;
>>> - break;
>>> - case MGN_VHT3SS_MCS0:
>>> - ret = DESC_RATEVHTSS3MCS0;
>>> - break;
>>> - case MGN_VHT3SS_MCS1:
>>> - ret = DESC_RATEVHTSS3MCS1;
>>> - break;
>>> - case MGN_VHT3SS_MCS2:
>>> - ret = DESC_RATEVHTSS3MCS2;
>>> - break;
>>> - case MGN_VHT3SS_MCS3:
>>> - ret = DESC_RATEVHTSS3MCS3;
>>> - break;
>>> - case MGN_VHT3SS_MCS4:
>>> - ret = DESC_RATEVHTSS3MCS4;
>>> - break;
>>> - case MGN_VHT3SS_MCS5:
>>> - ret = DESC_RATEVHTSS3MCS5;
>>> - break;
>>> - case MGN_VHT3SS_MCS6:
>>> - ret = DESC_RATEVHTSS3MCS6;
>>> - break;
>>> - case MGN_VHT3SS_MCS7:
>>> - ret = DESC_RATEVHTSS3MCS7;
>>> - break;
>>> - case MGN_VHT3SS_MCS8:
>>> - ret = DESC_RATEVHTSS3MCS8;
>>> - break;
>>> - case MGN_VHT3SS_MCS9:
>>> - ret = DESC_RATEVHTSS3MCS9;
>>> - break;
>>> - case MGN_VHT4SS_MCS0:
>>> - ret = DESC_RATEVHTSS4MCS0;
>>> - break;
>>> - case MGN_VHT4SS_MCS1:
>>> - ret = DESC_RATEVHTSS4MCS1;
>>> - break;
>>> - case MGN_VHT4SS_MCS2:
>>> - ret = DESC_RATEVHTSS4MCS2;
>>> - break;
>>> - case MGN_VHT4SS_MCS3:
>>> - ret = DESC_RATEVHTSS4MCS3;
>>> - break;
>>> - case MGN_VHT4SS_MCS4:
>>> - ret = DESC_RATEVHTSS4MCS4;
>>> - break;
>>> - case MGN_VHT4SS_MCS5:
>>> - ret = DESC_RATEVHTSS4MCS5;
>>> - break;
>>> - case MGN_VHT4SS_MCS6:
>>> - ret = DESC_RATEVHTSS4MCS6;
>>> - break;
>>> - case MGN_VHT4SS_MCS7:
>>> - ret = DESC_RATEVHTSS4MCS7;
>>> - break;
>>> - case MGN_VHT4SS_MCS8:
>>> - ret = DESC_RATEVHTSS4MCS8;
>>> - break;
>>> - case MGN_VHT4SS_MCS9:
>>> - ret = DESC_RATEVHTSS4MCS9;
>>> - break;
>>> default:
>>> break;
>>> }
>>> @@ -559,127 +439,6 @@ u8 HwRateToMRate(u8 rate)
>>> case DESC_RATEMCS31:
>>> ret_rate = MGN_MCS31;
>>> break;
>>> - case DESC_RATEVHTSS1MCS0:
>>> - ret_rate = MGN_VHT1SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS1:
>>> - ret_rate = MGN_VHT1SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS2:
>>> - ret_rate = MGN_VHT1SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS3:
>>> - ret_rate = MGN_VHT1SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS4:
>>> - ret_rate = MGN_VHT1SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS5:
>>> - ret_rate = MGN_VHT1SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS6:
>>> - ret_rate = MGN_VHT1SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS7:
>>> - ret_rate = MGN_VHT1SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS8:
>>> - ret_rate = MGN_VHT1SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS9:
>>> - ret_rate = MGN_VHT1SS_MCS9;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS0:
>>> - ret_rate = MGN_VHT2SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS1:
>>> - ret_rate = MGN_VHT2SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS2:
>>> - ret_rate = MGN_VHT2SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS3:
>>> - ret_rate = MGN_VHT2SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS4:
>>> - ret_rate = MGN_VHT2SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS5:
>>> - ret_rate = MGN_VHT2SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS6:
>>> - ret_rate = MGN_VHT2SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS7:
>>> - ret_rate = MGN_VHT2SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS8:
>>> - ret_rate = MGN_VHT2SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS9:
>>> - ret_rate = MGN_VHT2SS_MCS9;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS0:
>>> - ret_rate = MGN_VHT3SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS1:
>>> - ret_rate = MGN_VHT3SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS2:
>>> - ret_rate = MGN_VHT3SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS3:
>>> - ret_rate = MGN_VHT3SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS4:
>>> - ret_rate = MGN_VHT3SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS5:
>>> - ret_rate = MGN_VHT3SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS6:
>>> - ret_rate = MGN_VHT3SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS7:
>>> - ret_rate = MGN_VHT3SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS8:
>>> - ret_rate = MGN_VHT3SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS9:
>>> - ret_rate = MGN_VHT3SS_MCS9;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS0:
>>> - ret_rate = MGN_VHT4SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS1:
>>> - ret_rate = MGN_VHT4SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS2:
>>> - ret_rate = MGN_VHT4SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS3:
>>> - ret_rate = MGN_VHT4SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS4:
>>> - ret_rate = MGN_VHT4SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS5:
>>> - ret_rate = MGN_VHT4SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS6:
>>> - ret_rate = MGN_VHT4SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS7:
>>> - ret_rate = MGN_VHT4SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS8:
>>> - ret_rate = MGN_VHT4SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS9:
>>> - ret_rate = MGN_VHT4SS_MCS9;
>>> - break;
>>> -
>>> default:
>>> break;
>>> }
>>> diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
>>> index 395eb3b5af71..bb7941aee0c4 100644
>>> --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
>>> +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
>>> @@ -39,18 +39,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
>>> case HT_MCS24_MCS31:
>>> value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
>>> break;
>>> - case VHT_1SSMCS0_1SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
>>> - break;
>>> - case VHT_2SSMCS0_2SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
>>> - break;
>>> - case VHT_3SSMCS0_3SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
>>> - break;
>>> - case VHT_4SSMCS0_4SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
>>> - break;
>>> default:
>>> break;
>>> }
>>> @@ -91,18 +79,6 @@ phy_SetTxPowerByRateBase(
>>> case HT_MCS24_MCS31:
>>> pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
>>> break;
>>> - case VHT_1SSMCS0_1SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
>>> - break;
>>> - case VHT_2SSMCS0_2SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
>>> - break;
>>> - case VHT_3SSMCS0_3SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
>>> - break;
>>> - case VHT_4SSMCS0_4SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
>>> - break;
>>> default:
>>> break;
>>> }
>>> @@ -131,14 +107,6 @@ struct adapter *padapter
>>> base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
>>> phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
>>>
>>> - base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
>>> - phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
>>> -
>>> - base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
>>> - phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
>>> -
>>> - base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
>>> - phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
>>
>> You are removing a bunch of register writes from a block here, while keeping others,
>> so this does not seem like it is just dead-code removal it feels like you are
>> actually making a functional change.
>
> You are right, I will fix the changelog in next v2.
>
>>
>> Perhaps this entire block can never be executed ?
>
> It think it's executed during hal initialization
>
>>
>> Or maybe the VHT name used here is misleading and this is also relevant for 2.4 GHZ
>> 40Mhz use ? Did you test with an access point configured to use 40 MHz channels
>> and then checked that you were actually using a 40MHz channel ? Note these are
>> quite rare AFAIK because 40 MHz tends to cause even more collosion issues in the
>> already quite full 2.4G spectrum, still if possible you should test this and make
>> sure that it does not regress (with out specifically testing this we might not
>> note regressions for a long time because of 40MHz usage being rare).
>>
>
> The MCS section involved is from 0 to 9 in a set of up to 4 spatial streams,
> but rtl8723bs works only with 0-7 and 32 MCS rates in both 20 and 40 Mhz
> and multiple spatial streams are not supported.
>
> So setting something like VHT_{1,2,3}SSMCS0_{1,2,3}SSMCS9 in our case does
> something odd.
Right, but since we don't know what it is actually doing, it would be best
IMHO to just leave this as is. Esp. when the changes cannot be tested
with 40MHZ channel width.
Regards,
Hans
Hello Hans,
On Mon, Jun 21, 2021 at 11:48:27AM +0200, Hans de Goede wrote:
> Hi,
>
> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> > remove register initializations tied to 802.11ac standard which
> > is not supported by the device.
> >
> > It's a dangerous operation, relying only on comments, but tested
> > on a Lenovo Ideapad MIIX 300-10IBY tablet seems to work.
> >
> > Signed-off-by: Fabio Aiuto <[email protected]>
>
> TBH I think this patch should be dropped from the series, you
> are dropping a bunch of register writes which likely are actually
> doing something, so this is not just dead code removal.
>
> Regards,
>
> Hans
>
>
> > ---
> > drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 12 ------------
> > 1 file changed, 12 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> > index 059d3050acc6..3a03dfb8d275 100644
> > --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> > +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> > @@ -1718,24 +1718,12 @@ void _InitBurstPktLen_8723BS(struct adapter *Adapter)
> > struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
> >
> > rtw_write8(Adapter, 0x4c7, rtw_read8(Adapter, 0x4c7)|BIT(7)); /* enable single pkt ampdu */
> > - rtw_write8(Adapter, REG_RX_PKT_LIMIT_8723B, 0x18); /* for VHT packet length 11K */
> > rtw_write8(Adapter, REG_MAX_AGGR_NUM_8723B, 0x1F);
> > rtw_write8(Adapter, REG_PIFS_8723B, 0x00);
> > rtw_write8(Adapter, REG_FWHW_TXQ_CTRL_8723B, rtw_read8(Adapter, REG_FWHW_TXQ_CTRL)&(~BIT(7)));
> > if (pHalData->AMPDUBurstMode)
> > rtw_write8(Adapter, REG_AMPDU_BURST_MODE_8723B, 0x5F);
> > rtw_write8(Adapter, REG_AMPDU_MAX_TIME_8723B, 0x70);
> > -
> > - /* ARFB table 9 for 11ac 5G 2SS */
> > - rtw_write32(Adapter, REG_ARFR0_8723B, 0x00000010);
> > - if (IS_NORMAL_CHIP(pHalData->VersionID))
> > - rtw_write32(Adapter, REG_ARFR0_8723B+4, 0xfffff000);
> > - else
> > - rtw_write32(Adapter, REG_ARFR0_8723B+4, 0x3e0ff000);
> > -
> > - /* ARFB table 10 for 11ac 5G 1SS */
> > - rtw_write32(Adapter, REG_ARFR1_8723B, 0x00000010);
> > - rtw_write32(Adapter, REG_ARFR1_8723B+4, 0x003ff000);
> > }
> >
> > static void ResumeTxBeacon(struct adapter *padapter)
> >
>
ok, I will drop it in next v2.
Thank you for review,
fabio
Hello Hans,
On Mon, Jun 21, 2021 at 11:49:47AM +0200, Hans de Goede wrote:
> Hi Fabio,
>
> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> > This patch series removes all occurences of 5Ghz code over the
> > driver as required from driver's TODO list:
> >
> > - find and remove remaining code valid only for 5 GHz.
> > most of the obvious one have been removed, but things
> > like channel > 14 still exist.
> >
> > rtl8723bs work on 2.4Ghz band and supports 802.11bgn standards.
> > So all code related to 802.11a/ac standard is removed, as well
> > as code related to channel numbers above 14.
> >
> > VHT code is deleted as well, for it's related to 802.11ac.
> >
> > Comments are fixed accordingly and many unused variables are
> > deleted.
> >
> > Every single patch of this series has been tested on a
> > Lenovo Ideapad MIIX 300-10IBY except for the last one,
> > for obvious reason (it deletes just the TODO item).
>
> Thank you for your work on this. I've replied to 3 of
> the patches with some comments. The rest of the series
> looks ok to me (based on a quick scan of the patches).
>
> Regards,
>
> Hans
thank you, will improve what you pointed out
as soon as I figure out how to do it. See replies
to you reviews.
thank you,
fabio
>
>
>
> >
> > So:
> >
> > Tested-by: Fabio Auto <[email protected]>
> >
> > Fabio Aiuto (18):
> > staging: rtl8723bs: remove all 5Ghz network types
> > staging: rtl8723bs: remove code related to unsupported channel
> > bandwidth
> > staging: rtl8723bs: remove unused enum items related to channel
> > bonding
> > staging: rtl8723bs: rename enum items related to channel bonding
> > staging: rtl8723bs: remove 5Ghz field in struct registry_priv
> > staging: rtl8723bs: remove struct rt_channel_plan_5g
> > staging: rtl8723bs: remove all branchings between 2.4Ghz and 5Ghz band
> > types
> > staging: rtl8723bs: beautify prototypes in include/hal_com_phycfg.h
> > staging: rtl8723bs: remove 5Ghz code related to channel plan
> > definition
> > staging: rtl8723bs: remove some unused 5Ghz macro definitions
> > staging: rtl8723bs: remove 5Ghz code related to RF power calibration
> > staging: rtl8723bs: remove VHT dead code
> > staging: rtl8723bs: remove unused ODM_CMNINFO_BOARD_TYPE enum item
> > staging: rtl8723bs: fix macro value for 2.4Ghz only device
> > staging: rtl8723bs: remove register initializations tied to 802.11ac
> > standard
> > staging: rtl8723bs: remove obsolete 5Ghz comments
> > staging: rtl8723bs: fix check allowing 5Ghz settings
> > staging: rtl8723bs: remove item from TODO list
> >
> > drivers/staging/rtl8723bs/TODO | 2 -
> > drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +-
> > .../staging/rtl8723bs/core/rtw_ieee80211.c | 22 +-
> > drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 -
> > drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 328 ++---
> > .../staging/rtl8723bs/core/rtw_wlan_util.c | 29 +-
> > drivers/staging/rtl8723bs/core/rtw_xmit.c | 5 +-
> > .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 4 +-
> > .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 5 +-
> > drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 1 -
> > .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 17 +-
> > .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 595 ++++-----
> > .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 19 +-
> > drivers/staging/rtl8723bs/hal/hal_btcoex.c | 4 -
> > drivers/staging/rtl8723bs/hal/hal_com.c | 241 ----
> > .../staging/rtl8723bs/hal/hal_com_phycfg.c | 1059 +++--------------
> > drivers/staging/rtl8723bs/hal/odm.c | 50 -
> > drivers/staging/rtl8723bs/hal/odm.h | 42 +-
> > drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 -
> > .../rtl8723bs/hal/odm_EdcaTurboCheck.c | 4 +-
> > .../rtl8723bs/hal/odm_RegConfig8723B.c | 5 +-
> > .../rtl8723bs/hal/odm_RegConfig8723B.h | 2 -
> > drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 1 -
> > .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 53 +-
> > .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 43 +-
> > drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 -
> > .../rtl8723bs/include/Hal8192CPhyReg.h | 2 -
> > drivers/staging/rtl8723bs/include/drv_types.h | 10 +-
> > drivers/staging/rtl8723bs/include/hal_com.h | 62 +-
> > .../rtl8723bs/include/hal_com_phycfg.h | 198 +--
> > .../staging/rtl8723bs/include/hal_com_reg.h | 1 -
> > drivers/staging/rtl8723bs/include/hal_data.h | 40 +-
> > drivers/staging/rtl8723bs/include/hal_pg.h | 2 -
> > drivers/staging/rtl8723bs/include/hal_phy.h | 10 -
> > drivers/staging/rtl8723bs/include/ieee80211.h | 67 +-
> > .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
> > drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
> > .../staging/rtl8723bs/include/rtw_mlme_ext.h | 52 +-
> > drivers/staging/rtl8723bs/include/rtw_rf.h | 33 +-
> > drivers/staging/rtl8723bs/include/wifi.h | 1 -
> > .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 -
> > .../staging/rtl8723bs/os_dep/ioctl_linux.c | 8 +-
> > drivers/staging/rtl8723bs/os_dep/os_intfs.c | 13 +-
> > drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 -
> > 44 files changed, 640 insertions(+), 2450 deletions(-)
> >
>
On Mon, Jun 21, 2021 at 02:45:37PM +0200, Hans de Goede wrote:
Hello Hans,
> Hi,
>
> On 6/21/21 2:41 PM, Fabio Aiuto wrote:
> > On Mon, Jun 21, 2021 at 11:45:39AM +0200, Hans de Goede wrote:
> >> Hi,
> >>
> >> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> >>> remove VHT dead code, as the device doesn't support
> >>> VHT (which is a 802.11ac capability).
> >>>
> >>> Signed-off-by: Fabio Aiuto <[email protected]>
> >>> ---
> >>> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
> >>> drivers/staging/rtl8723bs/hal/hal_com.c | 241 -----------
> >>> .../staging/rtl8723bs/hal/hal_com_phycfg.c | 383 +-----------------
> >>> drivers/staging/rtl8723bs/include/hal_com.h | 62 +--
> >>> .../rtl8723bs/include/hal_com_phycfg.h | 4 -
> >>> drivers/staging/rtl8723bs/include/ieee80211.h | 45 --
> >>> .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
> >>> drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
> >>> 8 files changed, 9 insertions(+), 752 deletions(-)
> >>>
> >>> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> >>> index 285acd3d843b..c128d462c6c7 100644
> >>> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> >>> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> >>> @@ -46,7 +46,6 @@ static struct action_handler OnAction_tbl[] = {
> >>> {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved},
> >>> {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved},
> >>> {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved},
> >>> - {RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &DoReserved},
> >>> {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved},
> >>> };
> >>>
> >>> diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
> >>> index 7a88447f8294..eebd48438733 100644
> >>> --- a/drivers/staging/rtl8723bs/hal/hal_com.c
> >>> +++ b/drivers/staging/rtl8723bs/hal/hal_com.c
> >>> @@ -295,126 +295,6 @@ u8 MRateToHwRate(u8 rate)
> >>> case MGN_MCS31:
> >>> ret = DESC_RATEMCS31;
> >>> break;
> >>> - case MGN_VHT1SS_MCS0:
> >>> - ret = DESC_RATEVHTSS1MCS0;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS1:
> >>> - ret = DESC_RATEVHTSS1MCS1;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS2:
> >>> - ret = DESC_RATEVHTSS1MCS2;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS3:
> >>> - ret = DESC_RATEVHTSS1MCS3;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS4:
> >>> - ret = DESC_RATEVHTSS1MCS4;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS5:
> >>> - ret = DESC_RATEVHTSS1MCS5;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS6:
> >>> - ret = DESC_RATEVHTSS1MCS6;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS7:
> >>> - ret = DESC_RATEVHTSS1MCS7;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS8:
> >>> - ret = DESC_RATEVHTSS1MCS8;
> >>> - break;
> >>> - case MGN_VHT1SS_MCS9:
> >>> - ret = DESC_RATEVHTSS1MCS9;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS0:
> >>> - ret = DESC_RATEVHTSS2MCS0;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS1:
> >>> - ret = DESC_RATEVHTSS2MCS1;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS2:
> >>> - ret = DESC_RATEVHTSS2MCS2;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS3:
> >>> - ret = DESC_RATEVHTSS2MCS3;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS4:
> >>> - ret = DESC_RATEVHTSS2MCS4;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS5:
> >>> - ret = DESC_RATEVHTSS2MCS5;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS6:
> >>> - ret = DESC_RATEVHTSS2MCS6;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS7:
> >>> - ret = DESC_RATEVHTSS2MCS7;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS8:
> >>> - ret = DESC_RATEVHTSS2MCS8;
> >>> - break;
> >>> - case MGN_VHT2SS_MCS9:
> >>> - ret = DESC_RATEVHTSS2MCS9;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS0:
> >>> - ret = DESC_RATEVHTSS3MCS0;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS1:
> >>> - ret = DESC_RATEVHTSS3MCS1;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS2:
> >>> - ret = DESC_RATEVHTSS3MCS2;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS3:
> >>> - ret = DESC_RATEVHTSS3MCS3;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS4:
> >>> - ret = DESC_RATEVHTSS3MCS4;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS5:
> >>> - ret = DESC_RATEVHTSS3MCS5;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS6:
> >>> - ret = DESC_RATEVHTSS3MCS6;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS7:
> >>> - ret = DESC_RATEVHTSS3MCS7;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS8:
> >>> - ret = DESC_RATEVHTSS3MCS8;
> >>> - break;
> >>> - case MGN_VHT3SS_MCS9:
> >>> - ret = DESC_RATEVHTSS3MCS9;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS0:
> >>> - ret = DESC_RATEVHTSS4MCS0;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS1:
> >>> - ret = DESC_RATEVHTSS4MCS1;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS2:
> >>> - ret = DESC_RATEVHTSS4MCS2;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS3:
> >>> - ret = DESC_RATEVHTSS4MCS3;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS4:
> >>> - ret = DESC_RATEVHTSS4MCS4;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS5:
> >>> - ret = DESC_RATEVHTSS4MCS5;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS6:
> >>> - ret = DESC_RATEVHTSS4MCS6;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS7:
> >>> - ret = DESC_RATEVHTSS4MCS7;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS8:
> >>> - ret = DESC_RATEVHTSS4MCS8;
> >>> - break;
> >>> - case MGN_VHT4SS_MCS9:
> >>> - ret = DESC_RATEVHTSS4MCS9;
> >>> - break;
> >>> default:
> >>> break;
> >>> }
> >>> @@ -559,127 +439,6 @@ u8 HwRateToMRate(u8 rate)
> >>> case DESC_RATEMCS31:
> >>> ret_rate = MGN_MCS31;
> >>> break;
> >>> - case DESC_RATEVHTSS1MCS0:
> >>> - ret_rate = MGN_VHT1SS_MCS0;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS1:
> >>> - ret_rate = MGN_VHT1SS_MCS1;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS2:
> >>> - ret_rate = MGN_VHT1SS_MCS2;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS3:
> >>> - ret_rate = MGN_VHT1SS_MCS3;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS4:
> >>> - ret_rate = MGN_VHT1SS_MCS4;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS5:
> >>> - ret_rate = MGN_VHT1SS_MCS5;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS6:
> >>> - ret_rate = MGN_VHT1SS_MCS6;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS7:
> >>> - ret_rate = MGN_VHT1SS_MCS7;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS8:
> >>> - ret_rate = MGN_VHT1SS_MCS8;
> >>> - break;
> >>> - case DESC_RATEVHTSS1MCS9:
> >>> - ret_rate = MGN_VHT1SS_MCS9;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS0:
> >>> - ret_rate = MGN_VHT2SS_MCS0;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS1:
> >>> - ret_rate = MGN_VHT2SS_MCS1;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS2:
> >>> - ret_rate = MGN_VHT2SS_MCS2;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS3:
> >>> - ret_rate = MGN_VHT2SS_MCS3;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS4:
> >>> - ret_rate = MGN_VHT2SS_MCS4;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS5:
> >>> - ret_rate = MGN_VHT2SS_MCS5;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS6:
> >>> - ret_rate = MGN_VHT2SS_MCS6;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS7:
> >>> - ret_rate = MGN_VHT2SS_MCS7;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS8:
> >>> - ret_rate = MGN_VHT2SS_MCS8;
> >>> - break;
> >>> - case DESC_RATEVHTSS2MCS9:
> >>> - ret_rate = MGN_VHT2SS_MCS9;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS0:
> >>> - ret_rate = MGN_VHT3SS_MCS0;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS1:
> >>> - ret_rate = MGN_VHT3SS_MCS1;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS2:
> >>> - ret_rate = MGN_VHT3SS_MCS2;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS3:
> >>> - ret_rate = MGN_VHT3SS_MCS3;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS4:
> >>> - ret_rate = MGN_VHT3SS_MCS4;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS5:
> >>> - ret_rate = MGN_VHT3SS_MCS5;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS6:
> >>> - ret_rate = MGN_VHT3SS_MCS6;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS7:
> >>> - ret_rate = MGN_VHT3SS_MCS7;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS8:
> >>> - ret_rate = MGN_VHT3SS_MCS8;
> >>> - break;
> >>> - case DESC_RATEVHTSS3MCS9:
> >>> - ret_rate = MGN_VHT3SS_MCS9;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS0:
> >>> - ret_rate = MGN_VHT4SS_MCS0;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS1:
> >>> - ret_rate = MGN_VHT4SS_MCS1;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS2:
> >>> - ret_rate = MGN_VHT4SS_MCS2;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS3:
> >>> - ret_rate = MGN_VHT4SS_MCS3;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS4:
> >>> - ret_rate = MGN_VHT4SS_MCS4;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS5:
> >>> - ret_rate = MGN_VHT4SS_MCS5;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS6:
> >>> - ret_rate = MGN_VHT4SS_MCS6;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS7:
> >>> - ret_rate = MGN_VHT4SS_MCS7;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS8:
> >>> - ret_rate = MGN_VHT4SS_MCS8;
> >>> - break;
> >>> - case DESC_RATEVHTSS4MCS9:
> >>> - ret_rate = MGN_VHT4SS_MCS9;
> >>> - break;
> >>> -
> >>> default:
> >>> break;
> >>> }
> >>> diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> >>> index 395eb3b5af71..bb7941aee0c4 100644
> >>> --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> >>> +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> >>> @@ -39,18 +39,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
> >>> case HT_MCS24_MCS31:
> >>> value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
> >>> break;
> >>> - case VHT_1SSMCS0_1SSMCS9:
> >>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
> >>> - break;
> >>> - case VHT_2SSMCS0_2SSMCS9:
> >>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
> >>> - break;
> >>> - case VHT_3SSMCS0_3SSMCS9:
> >>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
> >>> - break;
> >>> - case VHT_4SSMCS0_4SSMCS9:
> >>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
> >>> - break;
> >>> default:
> >>> break;
> >>> }
> >>> @@ -91,18 +79,6 @@ phy_SetTxPowerByRateBase(
> >>> case HT_MCS24_MCS31:
> >>> pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
> >>> break;
> >>> - case VHT_1SSMCS0_1SSMCS9:
> >>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
> >>> - break;
> >>> - case VHT_2SSMCS0_2SSMCS9:
> >>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
> >>> - break;
> >>> - case VHT_3SSMCS0_3SSMCS9:
> >>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
> >>> - break;
> >>> - case VHT_4SSMCS0_4SSMCS9:
> >>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
> >>> - break;
> >>> default:
> >>> break;
> >>> }
> >>> @@ -131,14 +107,6 @@ struct adapter *padapter
> >>> base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
> >>> phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
> >>>
> >>> - base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
> >>> - phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
> >>> -
> >>> - base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
> >>> - phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
> >>> -
> >>> - base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
> >>> - phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
> >>
> >> You are removing a bunch of register writes from a block here, while keeping others,
> >> so this does not seem like it is just dead-code removal it feels like you are
> >> actually making a functional change.
> >
> > You are right, I will fix the changelog in next v2.
> >
> >>
> >> Perhaps this entire block can never be executed ?
> >
> > It think it's executed during hal initialization
> >
> >>
> >> Or maybe the VHT name used here is misleading and this is also relevant for 2.4 GHZ
> >> 40Mhz use ? Did you test with an access point configured to use 40 MHz channels
> >> and then checked that you were actually using a 40MHz channel ? Note these are
> >> quite rare AFAIK because 40 MHz tends to cause even more collosion issues in the
> >> already quite full 2.4G spectrum, still if possible you should test this and make
> >> sure that it does not regress (with out specifically testing this we might not
> >> note regressions for a long time because of 40MHz usage being rare).
> >>
> >
> > The MCS section involved is from 0 to 9 in a set of up to 4 spatial streams,
> > but rtl8723bs works only with 0-7 and 32 MCS rates in both 20 and 40 Mhz
> > and multiple spatial streams are not supported.
> >
> > So setting something like VHT_{1,2,3}SSMCS0_{1,2,3}SSMCS9 in our case does
> > something odd.
>
> Right, but since we don't know what it is actually doing, it would be best
> IMHO to just leave this as is. Esp. when the changes cannot be tested
> with 40MHZ channel width.
>
> Regards,
>
> Hans
>
you are right, will drop this patch as well.
Thank you,
fabio.
Hello Hans,
On Mon, Jun 21, 2021 at 11:45:39AM +0200, Hans de Goede wrote:
> Hi,
>
> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
> > remove VHT dead code, as the device doesn't support
> > VHT (which is a 802.11ac capability).
> >
> > Signed-off-by: Fabio Aiuto <[email protected]>
> > ---
> > drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
> > drivers/staging/rtl8723bs/hal/hal_com.c | 241 -----------
> > .../staging/rtl8723bs/hal/hal_com_phycfg.c | 383 +-----------------
> > drivers/staging/rtl8723bs/include/hal_com.h | 62 +--
> > .../rtl8723bs/include/hal_com_phycfg.h | 4 -
> > drivers/staging/rtl8723bs/include/ieee80211.h | 45 --
> > .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
> > drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
> > 8 files changed, 9 insertions(+), 752 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > index 285acd3d843b..c128d462c6c7 100644
> > --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
> > @@ -46,7 +46,6 @@ static struct action_handler OnAction_tbl[] = {
> > {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved},
> > {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved},
> > {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved},
> > - {RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &DoReserved},
> > {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved},
> > };
> >
> > diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
> > index 7a88447f8294..eebd48438733 100644
> > --- a/drivers/staging/rtl8723bs/hal/hal_com.c
> > +++ b/drivers/staging/rtl8723bs/hal/hal_com.c
> > @@ -295,126 +295,6 @@ u8 MRateToHwRate(u8 rate)
> > case MGN_MCS31:
> > ret = DESC_RATEMCS31;
> > break;
> > - case MGN_VHT1SS_MCS0:
> > - ret = DESC_RATEVHTSS1MCS0;
> > - break;
> > - case MGN_VHT1SS_MCS1:
> > - ret = DESC_RATEVHTSS1MCS1;
> > - break;
> > - case MGN_VHT1SS_MCS2:
> > - ret = DESC_RATEVHTSS1MCS2;
> > - break;
> > - case MGN_VHT1SS_MCS3:
> > - ret = DESC_RATEVHTSS1MCS3;
> > - break;
> > - case MGN_VHT1SS_MCS4:
> > - ret = DESC_RATEVHTSS1MCS4;
> > - break;
> > - case MGN_VHT1SS_MCS5:
> > - ret = DESC_RATEVHTSS1MCS5;
> > - break;
> > - case MGN_VHT1SS_MCS6:
> > - ret = DESC_RATEVHTSS1MCS6;
> > - break;
> > - case MGN_VHT1SS_MCS7:
> > - ret = DESC_RATEVHTSS1MCS7;
> > - break;
> > - case MGN_VHT1SS_MCS8:
> > - ret = DESC_RATEVHTSS1MCS8;
> > - break;
> > - case MGN_VHT1SS_MCS9:
> > - ret = DESC_RATEVHTSS1MCS9;
> > - break;
> > - case MGN_VHT2SS_MCS0:
> > - ret = DESC_RATEVHTSS2MCS0;
> > - break;
> > - case MGN_VHT2SS_MCS1:
> > - ret = DESC_RATEVHTSS2MCS1;
> > - break;
> > - case MGN_VHT2SS_MCS2:
> > - ret = DESC_RATEVHTSS2MCS2;
> > - break;
> > - case MGN_VHT2SS_MCS3:
> > - ret = DESC_RATEVHTSS2MCS3;
> > - break;
> > - case MGN_VHT2SS_MCS4:
> > - ret = DESC_RATEVHTSS2MCS4;
> > - break;
> > - case MGN_VHT2SS_MCS5:
> > - ret = DESC_RATEVHTSS2MCS5;
> > - break;
> > - case MGN_VHT2SS_MCS6:
> > - ret = DESC_RATEVHTSS2MCS6;
> > - break;
> > - case MGN_VHT2SS_MCS7:
> > - ret = DESC_RATEVHTSS2MCS7;
> > - break;
> > - case MGN_VHT2SS_MCS8:
> > - ret = DESC_RATEVHTSS2MCS8;
> > - break;
> > - case MGN_VHT2SS_MCS9:
> > - ret = DESC_RATEVHTSS2MCS9;
> > - break;
> > - case MGN_VHT3SS_MCS0:
> > - ret = DESC_RATEVHTSS3MCS0;
> > - break;
> > - case MGN_VHT3SS_MCS1:
> > - ret = DESC_RATEVHTSS3MCS1;
> > - break;
> > - case MGN_VHT3SS_MCS2:
> > - ret = DESC_RATEVHTSS3MCS2;
> > - break;
> > - case MGN_VHT3SS_MCS3:
> > - ret = DESC_RATEVHTSS3MCS3;
> > - break;
> > - case MGN_VHT3SS_MCS4:
> > - ret = DESC_RATEVHTSS3MCS4;
> > - break;
> > - case MGN_VHT3SS_MCS5:
> > - ret = DESC_RATEVHTSS3MCS5;
> > - break;
> > - case MGN_VHT3SS_MCS6:
> > - ret = DESC_RATEVHTSS3MCS6;
> > - break;
> > - case MGN_VHT3SS_MCS7:
> > - ret = DESC_RATEVHTSS3MCS7;
> > - break;
> > - case MGN_VHT3SS_MCS8:
> > - ret = DESC_RATEVHTSS3MCS8;
> > - break;
> > - case MGN_VHT3SS_MCS9:
> > - ret = DESC_RATEVHTSS3MCS9;
> > - break;
> > - case MGN_VHT4SS_MCS0:
> > - ret = DESC_RATEVHTSS4MCS0;
> > - break;
> > - case MGN_VHT4SS_MCS1:
> > - ret = DESC_RATEVHTSS4MCS1;
> > - break;
> > - case MGN_VHT4SS_MCS2:
> > - ret = DESC_RATEVHTSS4MCS2;
> > - break;
> > - case MGN_VHT4SS_MCS3:
> > - ret = DESC_RATEVHTSS4MCS3;
> > - break;
> > - case MGN_VHT4SS_MCS4:
> > - ret = DESC_RATEVHTSS4MCS4;
> > - break;
> > - case MGN_VHT4SS_MCS5:
> > - ret = DESC_RATEVHTSS4MCS5;
> > - break;
> > - case MGN_VHT4SS_MCS6:
> > - ret = DESC_RATEVHTSS4MCS6;
> > - break;
> > - case MGN_VHT4SS_MCS7:
> > - ret = DESC_RATEVHTSS4MCS7;
> > - break;
> > - case MGN_VHT4SS_MCS8:
> > - ret = DESC_RATEVHTSS4MCS8;
> > - break;
> > - case MGN_VHT4SS_MCS9:
> > - ret = DESC_RATEVHTSS4MCS9;
> > - break;
> > default:
> > break;
> > }
> > @@ -559,127 +439,6 @@ u8 HwRateToMRate(u8 rate)
> > case DESC_RATEMCS31:
> > ret_rate = MGN_MCS31;
> > break;
> > - case DESC_RATEVHTSS1MCS0:
> > - ret_rate = MGN_VHT1SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS1MCS1:
> > - ret_rate = MGN_VHT1SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS1MCS2:
> > - ret_rate = MGN_VHT1SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS1MCS3:
> > - ret_rate = MGN_VHT1SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS1MCS4:
> > - ret_rate = MGN_VHT1SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS1MCS5:
> > - ret_rate = MGN_VHT1SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS1MCS6:
> > - ret_rate = MGN_VHT1SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS1MCS7:
> > - ret_rate = MGN_VHT1SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS1MCS8:
> > - ret_rate = MGN_VHT1SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS1MCS9:
> > - ret_rate = MGN_VHT1SS_MCS9;
> > - break;
> > - case DESC_RATEVHTSS2MCS0:
> > - ret_rate = MGN_VHT2SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS2MCS1:
> > - ret_rate = MGN_VHT2SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS2MCS2:
> > - ret_rate = MGN_VHT2SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS2MCS3:
> > - ret_rate = MGN_VHT2SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS2MCS4:
> > - ret_rate = MGN_VHT2SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS2MCS5:
> > - ret_rate = MGN_VHT2SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS2MCS6:
> > - ret_rate = MGN_VHT2SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS2MCS7:
> > - ret_rate = MGN_VHT2SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS2MCS8:
> > - ret_rate = MGN_VHT2SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS2MCS9:
> > - ret_rate = MGN_VHT2SS_MCS9;
> > - break;
> > - case DESC_RATEVHTSS3MCS0:
> > - ret_rate = MGN_VHT3SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS3MCS1:
> > - ret_rate = MGN_VHT3SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS3MCS2:
> > - ret_rate = MGN_VHT3SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS3MCS3:
> > - ret_rate = MGN_VHT3SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS3MCS4:
> > - ret_rate = MGN_VHT3SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS3MCS5:
> > - ret_rate = MGN_VHT3SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS3MCS6:
> > - ret_rate = MGN_VHT3SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS3MCS7:
> > - ret_rate = MGN_VHT3SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS3MCS8:
> > - ret_rate = MGN_VHT3SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS3MCS9:
> > - ret_rate = MGN_VHT3SS_MCS9;
> > - break;
> > - case DESC_RATEVHTSS4MCS0:
> > - ret_rate = MGN_VHT4SS_MCS0;
> > - break;
> > - case DESC_RATEVHTSS4MCS1:
> > - ret_rate = MGN_VHT4SS_MCS1;
> > - break;
> > - case DESC_RATEVHTSS4MCS2:
> > - ret_rate = MGN_VHT4SS_MCS2;
> > - break;
> > - case DESC_RATEVHTSS4MCS3:
> > - ret_rate = MGN_VHT4SS_MCS3;
> > - break;
> > - case DESC_RATEVHTSS4MCS4:
> > - ret_rate = MGN_VHT4SS_MCS4;
> > - break;
> > - case DESC_RATEVHTSS4MCS5:
> > - ret_rate = MGN_VHT4SS_MCS5;
> > - break;
> > - case DESC_RATEVHTSS4MCS6:
> > - ret_rate = MGN_VHT4SS_MCS6;
> > - break;
> > - case DESC_RATEVHTSS4MCS7:
> > - ret_rate = MGN_VHT4SS_MCS7;
> > - break;
> > - case DESC_RATEVHTSS4MCS8:
> > - ret_rate = MGN_VHT4SS_MCS8;
> > - break;
> > - case DESC_RATEVHTSS4MCS9:
> > - ret_rate = MGN_VHT4SS_MCS9;
> > - break;
> > -
> > default:
> > break;
> > }
> > diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> > index 395eb3b5af71..bb7941aee0c4 100644
> > --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> > +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> > @@ -39,18 +39,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
> > case HT_MCS24_MCS31:
> > value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
> > break;
> > - case VHT_1SSMCS0_1SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
> > - break;
> > - case VHT_2SSMCS0_2SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
> > - break;
> > - case VHT_3SSMCS0_3SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
> > - break;
> > - case VHT_4SSMCS0_4SSMCS9:
> > - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
> > - break;
> > default:
> > break;
> > }
> > @@ -91,18 +79,6 @@ phy_SetTxPowerByRateBase(
> > case HT_MCS24_MCS31:
> > pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
> > break;
> > - case VHT_1SSMCS0_1SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
> > - break;
> > - case VHT_2SSMCS0_2SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
> > - break;
> > - case VHT_3SSMCS0_3SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
> > - break;
> > - case VHT_4SSMCS0_4SSMCS9:
> > - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
> > - break;
> > default:
> > break;
> > }
> > @@ -131,14 +107,6 @@ struct adapter *padapter
> > base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
> > phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
> >
> > - base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
> > - phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
> > -
> > - base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
> > - phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
> > -
> > - base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
> > - phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
>
> You are removing a bunch of register writes from a block here, while keeping others,
> so this does not seem like it is just dead-code removal it feels like you are
> actually making a functional change.
I looked deeply at what I deed, and I just removed some functions updating tables
in memory, no register write here. Tables are used to load Tx Power Limit. So
removing these function calls according with the removal of the VHT enum items
grants that wrong Power Limits will never be fetched.
Moreover I have been quite conservative, for I left untouched HT indexes above
7 which rtl8723bs doesn't support.
So IMO I think this patch is fine as is...
>
> Perhaps this entire block can never be executed ?
the block is executed but there's no register write happening. Just
updating of values which will never be fetched.
>
> Or maybe the VHT name used here is misleading and this is also relevant for 2.4 GHZ
> 40Mhz use ? Did you test with an access point configured to use 40 MHz channels
> and then checked that you were actually using a 40MHz channel ? Note these are
> quite rare AFAIK because 40 MHz tends to cause even more collosion issues in the
> already quite full 2.4G spectrum, still if possible you should test this and make
> sure that it does not regress (with out specifically testing this we might not
> note regressions for a long time because of 40MHz usage being rare).
>
>
>
>
> > }
> > }
> >
> > @@ -442,81 +410,6 @@ PHY_GetRateValuesOfTxPowerByRate(
> > *RateNum = 4;
> > break;
> >
> > - case 0xC3C:
> > - case 0xE3C:
> > - case 0x183C:
> > - case 0x1a3C:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS0);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS1);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS2);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS3);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC40:
> > - case 0xE40:
> > - case 0x1840:
> > - case 0x1a40:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS4);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS5);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS6);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS7);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC44:
> > - case 0xE44:
> > - case 0x1844:
> > - case 0x1a44:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS8);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT1SS_MCS9);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC48:
> > - case 0xE48:
> > - case 0x1848:
> > - case 0x1a48:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS2);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS3);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS4);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS5);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xC4C:
> > - case 0xE4C:
> > - case 0x184C:
> > - case 0x1a4C:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS6);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS7);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS8);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS9);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > case 0xCD8:
> > case 0xED8:
> > case 0x18D8:
> > @@ -547,49 +440,6 @@ PHY_GetRateValuesOfTxPowerByRate(
> > *RateNum = 4;
> > break;
> >
> > - case 0xCE0:
> > - case 0xEE0:
> > - case 0x18E0:
> > - case 0x1aE0:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS0);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS1);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS2);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS3);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xCE4:
> > - case 0xEE4:
> > - case 0x18E4:
> > - case 0x1aE4:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS4);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS5);
> > - RateIndex[2] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS6);
> > - RateIndex[3] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS7);
> > - for (i = 0; i < 4; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
> > - case 0xCE8:
> > - case 0xEE8:
> > - case 0x18E8:
> > - case 0x1aE8:
> > - RateIndex[0] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS8);
> > - RateIndex[1] = PHY_GetRateIndexOfTxPowerByRate(MGN_VHT3SS_MCS9);
> > - for (i = 0; i < 2; ++i) {
> > - PwrByRateVal[i] = (s8) ((((Value >> (i * 8 + 4)) & 0xF)) * 10 +
> > - ((Value >> (i * 8)) & 0xF));
> > - }
> > - *RateNum = 4;
> > - break;
> > -
>
> Here only 2 rates are set, so this feels like it is a 40MHz case, are you
> sure this can be removed (maybe it is 40MHz channel use at 5GHz ?
>
> The rest of the patch looks ok.
>
> Regards,
>
> Hans
>
>
>
>
> > default:
> > break;
> > }
> > @@ -617,10 +467,6 @@ static void PHY_StoreTxPowerByRateNew(
> > return;
> >
> > for (i = 0; i < rateNum; ++i) {
> > - if (rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS0) ||
> > - rateIndex[i] == PHY_GetRateIndexOfTxPowerByRate(MGN_VHT2SS_MCS1))
> > - TxNum = RF_2TX;
> > -
> > pHalData->TxPwrByRateOffset[RfPath][TxNum][rateIndex[i]] = PwrByRateVal[i];
> > }
> > }
> > @@ -691,18 +537,6 @@ struct adapter *padapter
> > u8 mcs16_23Rates[8] = {
> > MGN_MCS16, MGN_MCS17, MGN_MCS18, MGN_MCS19, MGN_MCS20, MGN_MCS21, MGN_MCS22, MGN_MCS23
> > };
> > - u8 vht1ssRates[10] = {
> > - MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
> > - MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9
> > - };
> > - u8 vht2ssRates[10] = {
> > - MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
> > - MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9
> > - };
> > - u8 vht3ssRates[10] = {
> > - MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
> > - MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9
> > - };
> >
> > for (path = ODM_RF_PATH_A; path <= ODM_RF_PATH_D; ++path) {
> > for (txNum = RF_1TX; txNum < RF_MAX_TX_NUM; ++txNum) {
> > @@ -740,27 +574,6 @@ struct adapter *padapter
> > value = PHY_GetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i]);
> > PHY_SetTxPowerByRate(padapter, path, txNum, mcs16_23Rates[i], value - base);
> > }
> > -
> > - /* VHT 1SS */
> > - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT1SS_MCS7);
> > - for (i = 0; i < sizeof(vht1ssRates); ++i) {
> > - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht1ssRates[i]);
> > - PHY_SetTxPowerByRate(padapter, path, txNum, vht1ssRates[i], value - base);
> > - }
> > -
> > - /* VHT 2SS */
> > - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT2SS_MCS7);
> > - for (i = 0; i < sizeof(vht2ssRates); ++i) {
> > - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht2ssRates[i]);
> > - PHY_SetTxPowerByRate(padapter, path, txNum, vht2ssRates[i], value - base);
> > - }
> > -
> > - /* VHT 3SS */
> > - base = PHY_GetTxPowerByRate(padapter, path, txNum, MGN_VHT3SS_MCS7);
> > - for (i = 0; i < sizeof(vht3ssRates); ++i) {
> > - value = PHY_GetTxPowerByRate(padapter, path, txNum, vht3ssRates[i]);
> > - PHY_SetTxPowerByRate(padapter, path, txNum, vht3ssRates[i], value - base);
> > - }
> > }
> > }
> > }
> > @@ -823,38 +636,6 @@ void PHY_SetTxPowerIndexByRateSection(
> > Channel, htRates4T,
> > ARRAY_SIZE(htRates4T));
> >
> > - } else if (RateSection == VHT_1SSMCS0_1SSMCS9) {
> > - u8 vhtRates1T[] = {MGN_VHT1SS_MCS0, MGN_VHT1SS_MCS1, MGN_VHT1SS_MCS2, MGN_VHT1SS_MCS3, MGN_VHT1SS_MCS4,
> > - MGN_VHT1SS_MCS5, MGN_VHT1SS_MCS6, MGN_VHT1SS_MCS7, MGN_VHT1SS_MCS8, MGN_VHT1SS_MCS9};
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates1T,
> > - ARRAY_SIZE(vhtRates1T));
> > -
> > - } else if (RateSection == VHT_2SSMCS0_2SSMCS9) {
> > - u8 vhtRates2T[] = {MGN_VHT2SS_MCS0, MGN_VHT2SS_MCS1, MGN_VHT2SS_MCS2, MGN_VHT2SS_MCS3, MGN_VHT2SS_MCS4,
> > - MGN_VHT2SS_MCS5, MGN_VHT2SS_MCS6, MGN_VHT2SS_MCS7, MGN_VHT2SS_MCS8, MGN_VHT2SS_MCS9};
> > -
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates2T,
> > - ARRAY_SIZE(vhtRates2T));
> > - } else if (RateSection == VHT_3SSMCS0_3SSMCS9) {
> > - u8 vhtRates3T[] = {MGN_VHT3SS_MCS0, MGN_VHT3SS_MCS1, MGN_VHT3SS_MCS2, MGN_VHT3SS_MCS3, MGN_VHT3SS_MCS4,
> > - MGN_VHT3SS_MCS5, MGN_VHT3SS_MCS6, MGN_VHT3SS_MCS7, MGN_VHT3SS_MCS8, MGN_VHT3SS_MCS9};
> > -
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates3T,
> > - ARRAY_SIZE(vhtRates3T));
> > - } else if (RateSection == VHT_4SSMCS0_4SSMCS9) {
> > - u8 vhtRates4T[] = {MGN_VHT4SS_MCS0, MGN_VHT4SS_MCS1, MGN_VHT4SS_MCS2, MGN_VHT4SS_MCS3, MGN_VHT4SS_MCS4,
> > - MGN_VHT4SS_MCS5, MGN_VHT4SS_MCS6, MGN_VHT4SS_MCS7, MGN_VHT4SS_MCS8, MGN_VHT4SS_MCS9};
> > -
> > - PHY_SetTxPowerIndexByRateArray(padapter, RFPath,
> > - pHalData->CurrentChannelBW,
> > - Channel, vhtRates4T,
> > - ARRAY_SIZE(vhtRates4T));
> > }
> > }
> >
> > @@ -883,23 +664,23 @@ u8 PHY_GetTxPowerIndexBase(
> > txPower += pHalData->OFDM_24G_Diff[RFPath][TX_1S];
> >
> > if (BandWidth == CHANNEL_WIDTH_20) { /* BW20-1S, BW20-2S */
> > - if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_1S];
> > - if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_2S];
> > - if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_3S];
> > - if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW20_24G_Diff[RFPath][TX_4S];
> >
> > } else if (BandWidth == CHANNEL_WIDTH_40) { /* BW40-1S, BW40-2S */
> > - if ((MGN_MCS0 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT1SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS0 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_1S];
> > - if ((MGN_MCS8 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT2SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS8 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_2S];
> > - if ((MGN_MCS16 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT3SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS16 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_3S];
> > - if ((MGN_MCS24 <= Rate && Rate <= MGN_MCS31) || (MGN_VHT4SS_MCS0 <= Rate && Rate <= MGN_VHT4SS_MCS9))
> > + if (MGN_MCS24 <= Rate && Rate <= MGN_MCS31)
> > txPower += pHalData->BW40_24G_Diff[RFPath][TX_4S];
> >
> > }
> > @@ -1060,126 +841,6 @@ u8 PHY_GetRateIndexOfTxPowerByRate(u8 Rate)
> > case MGN_MCS31:
> > index = 43;
> > break;
> > - case MGN_VHT1SS_MCS0:
> > - index = 44;
> > - break;
> > - case MGN_VHT1SS_MCS1:
> > - index = 45;
> > - break;
> > - case MGN_VHT1SS_MCS2:
> > - index = 46;
> > - break;
> > - case MGN_VHT1SS_MCS3:
> > - index = 47;
> > - break;
> > - case MGN_VHT1SS_MCS4:
> > - index = 48;
> > - break;
> > - case MGN_VHT1SS_MCS5:
> > - index = 49;
> > - break;
> > - case MGN_VHT1SS_MCS6:
> > - index = 50;
> > - break;
> > - case MGN_VHT1SS_MCS7:
> > - index = 51;
> > - break;
> > - case MGN_VHT1SS_MCS8:
> > - index = 52;
> > - break;
> > - case MGN_VHT1SS_MCS9:
> > - index = 53;
> > - break;
> > - case MGN_VHT2SS_MCS0:
> > - index = 54;
> > - break;
> > - case MGN_VHT2SS_MCS1:
> > - index = 55;
> > - break;
> > - case MGN_VHT2SS_MCS2:
> > - index = 56;
> > - break;
> > - case MGN_VHT2SS_MCS3:
> > - index = 57;
> > - break;
> > - case MGN_VHT2SS_MCS4:
> > - index = 58;
> > - break;
> > - case MGN_VHT2SS_MCS5:
> > - index = 59;
> > - break;
> > - case MGN_VHT2SS_MCS6:
> > - index = 60;
> > - break;
> > - case MGN_VHT2SS_MCS7:
> > - index = 61;
> > - break;
> > - case MGN_VHT2SS_MCS8:
> > - index = 62;
> > - break;
> > - case MGN_VHT2SS_MCS9:
> > - index = 63;
> > - break;
> > - case MGN_VHT3SS_MCS0:
> > - index = 64;
> > - break;
> > - case MGN_VHT3SS_MCS1:
> > - index = 65;
> > - break;
> > - case MGN_VHT3SS_MCS2:
> > - index = 66;
> > - break;
> > - case MGN_VHT3SS_MCS3:
> > - index = 67;
> > - break;
> > - case MGN_VHT3SS_MCS4:
> > - index = 68;
> > - break;
> > - case MGN_VHT3SS_MCS5:
> > - index = 69;
> > - break;
> > - case MGN_VHT3SS_MCS6:
> > - index = 70;
> > - break;
> > - case MGN_VHT3SS_MCS7:
> > - index = 71;
> > - break;
> > - case MGN_VHT3SS_MCS8:
> > - index = 72;
> > - break;
> > - case MGN_VHT3SS_MCS9:
> > - index = 73;
> > - break;
> > - case MGN_VHT4SS_MCS0:
> > - index = 74;
> > - break;
> > - case MGN_VHT4SS_MCS1:
> > - index = 75;
> > - break;
> > - case MGN_VHT4SS_MCS2:
> > - index = 76;
> > - break;
> > - case MGN_VHT4SS_MCS3:
> > - index = 77;
> > - break;
> > - case MGN_VHT4SS_MCS4:
> > - index = 78;
> > - break;
> > - case MGN_VHT4SS_MCS5:
> > - index = 79;
> > - break;
> > - case MGN_VHT4SS_MCS6:
> > - index = 80;
> > - break;
> > - case MGN_VHT4SS_MCS7:
> > - index = 81;
> > - break;
> > - case MGN_VHT4SS_MCS8:
> > - index = 82;
> > - break;
> > - case MGN_VHT4SS_MCS9:
> > - index = 83;
> > - break;
> > default:
> > break;
> > }
> > @@ -1319,26 +980,6 @@ static s16 get_rate_sctn_idx(const u8 rate)
> > case MGN_MCS24: case MGN_MCS25: case MGN_MCS26: case MGN_MCS27:
> > case MGN_MCS28: case MGN_MCS29: case MGN_MCS30: case MGN_MCS31:
> > return 5;
> > - case MGN_VHT1SS_MCS0: case MGN_VHT1SS_MCS1: case MGN_VHT1SS_MCS2:
> > - case MGN_VHT1SS_MCS3: case MGN_VHT1SS_MCS4: case MGN_VHT1SS_MCS5:
> > - case MGN_VHT1SS_MCS6: case MGN_VHT1SS_MCS7: case MGN_VHT1SS_MCS8:
> > - case MGN_VHT1SS_MCS9:
> > - return 6;
> > - case MGN_VHT2SS_MCS0: case MGN_VHT2SS_MCS1: case MGN_VHT2SS_MCS2:
> > - case MGN_VHT2SS_MCS3: case MGN_VHT2SS_MCS4: case MGN_VHT2SS_MCS5:
> > - case MGN_VHT2SS_MCS6: case MGN_VHT2SS_MCS7: case MGN_VHT2SS_MCS8:
> > - case MGN_VHT2SS_MCS9:
> > - return 7;
> > - case MGN_VHT3SS_MCS0: case MGN_VHT3SS_MCS1: case MGN_VHT3SS_MCS2:
> > - case MGN_VHT3SS_MCS3: case MGN_VHT3SS_MCS4: case MGN_VHT3SS_MCS5:
> > - case MGN_VHT3SS_MCS6: case MGN_VHT3SS_MCS7: case MGN_VHT3SS_MCS8:
> > - case MGN_VHT3SS_MCS9:
> > - return 8;
> > - case MGN_VHT4SS_MCS0: case MGN_VHT4SS_MCS1: case MGN_VHT4SS_MCS2:
> > - case MGN_VHT4SS_MCS3: case MGN_VHT4SS_MCS4: case MGN_VHT4SS_MCS5:
> > - case MGN_VHT4SS_MCS6: case MGN_VHT4SS_MCS7: case MGN_VHT4SS_MCS8:
> > - case MGN_VHT4SS_MCS9:
> > - return 9;
> > default:
> > return -1;
> > }
> > @@ -1510,14 +1151,6 @@ void PHY_SetTxPowerLimit(
> > rateSection = 4;
> > else if (eqNByte(RateSection, (u8 *)("HT"), 2) && eqNByte(RfPath, (u8 *)("4T"), 2))
> > rateSection = 5;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("1T"), 2))
> > - rateSection = 6;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("2T"), 2))
> > - rateSection = 7;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("3T"), 2))
> > - rateSection = 8;
> > - else if (eqNByte(RateSection, (u8 *)("VHT"), 3) && eqNByte(RfPath, (u8 *)("4T"), 2))
> > - rateSection = 9;
> > else
> > return;
> >
> > diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
> > index 6bcc443d59fb..1bc332261b2a 100644
> > --- a/drivers/staging/rtl8723bs/include/hal_com.h
> > +++ b/drivers/staging/rtl8723bs/include/hal_com.h
> > @@ -69,46 +69,6 @@
> > #define DESC_RATEMCS29 0x29
> > #define DESC_RATEMCS30 0x2A
> > #define DESC_RATEMCS31 0x2B
> > -#define DESC_RATEVHTSS1MCS0 0x2C
> > -#define DESC_RATEVHTSS1MCS1 0x2D
> > -#define DESC_RATEVHTSS1MCS2 0x2E
> > -#define DESC_RATEVHTSS1MCS3 0x2F
> > -#define DESC_RATEVHTSS1MCS4 0x30
> > -#define DESC_RATEVHTSS1MCS5 0x31
> > -#define DESC_RATEVHTSS1MCS6 0x32
> > -#define DESC_RATEVHTSS1MCS7 0x33
> > -#define DESC_RATEVHTSS1MCS8 0x34
> > -#define DESC_RATEVHTSS1MCS9 0x35
> > -#define DESC_RATEVHTSS2MCS0 0x36
> > -#define DESC_RATEVHTSS2MCS1 0x37
> > -#define DESC_RATEVHTSS2MCS2 0x38
> > -#define DESC_RATEVHTSS2MCS3 0x39
> > -#define DESC_RATEVHTSS2MCS4 0x3A
> > -#define DESC_RATEVHTSS2MCS5 0x3B
> > -#define DESC_RATEVHTSS2MCS6 0x3C
> > -#define DESC_RATEVHTSS2MCS7 0x3D
> > -#define DESC_RATEVHTSS2MCS8 0x3E
> > -#define DESC_RATEVHTSS2MCS9 0x3F
> > -#define DESC_RATEVHTSS3MCS0 0x40
> > -#define DESC_RATEVHTSS3MCS1 0x41
> > -#define DESC_RATEVHTSS3MCS2 0x42
> > -#define DESC_RATEVHTSS3MCS3 0x43
> > -#define DESC_RATEVHTSS3MCS4 0x44
> > -#define DESC_RATEVHTSS3MCS5 0x45
> > -#define DESC_RATEVHTSS3MCS6 0x46
> > -#define DESC_RATEVHTSS3MCS7 0x47
> > -#define DESC_RATEVHTSS3MCS8 0x48
> > -#define DESC_RATEVHTSS3MCS9 0x49
> > -#define DESC_RATEVHTSS4MCS0 0x4A
> > -#define DESC_RATEVHTSS4MCS1 0x4B
> > -#define DESC_RATEVHTSS4MCS2 0x4C
> > -#define DESC_RATEVHTSS4MCS3 0x4D
> > -#define DESC_RATEVHTSS4MCS4 0x4E
> > -#define DESC_RATEVHTSS4MCS5 0x4F
> > -#define DESC_RATEVHTSS4MCS6 0x50
> > -#define DESC_RATEVHTSS4MCS7 0x51
> > -#define DESC_RATEVHTSS4MCS8 0x52
> > -#define DESC_RATEVHTSS4MCS9 0x53
> >
> > #define HDATA_RATE(rate)\
> > (rate == DESC_RATE1M) ? "CCK_1M" : \
> > @@ -138,27 +98,7 @@
> > (rate == DESC_RATEMCS12) ? "MCS12" : \
> > (rate == DESC_RATEMCS13) ? "MCS13" : \
> > (rate == DESC_RATEMCS14) ? "MCS14" : \
> > -(rate == DESC_RATEMCS15) ? "MCS15" : \
> > -(rate == DESC_RATEVHTSS1MCS0) ? "VHTSS1MCS0" : \
> > -(rate == DESC_RATEVHTSS1MCS1) ? "VHTSS1MCS1" : \
> > -(rate == DESC_RATEVHTSS1MCS2) ? "VHTSS1MCS2" : \
> > -(rate == DESC_RATEVHTSS1MCS3) ? "VHTSS1MCS3" : \
> > -(rate == DESC_RATEVHTSS1MCS4) ? "VHTSS1MCS4" : \
> > -(rate == DESC_RATEVHTSS1MCS5) ? "VHTSS1MCS5" : \
> > -(rate == DESC_RATEVHTSS1MCS6) ? "VHTSS1MCS6" : \
> > -(rate == DESC_RATEVHTSS1MCS7) ? "VHTSS1MCS7" : \
> > -(rate == DESC_RATEVHTSS1MCS8) ? "VHTSS1MCS8" : \
> > -(rate == DESC_RATEVHTSS1MCS9) ? "VHTSS1MCS9" : \
> > -(rate == DESC_RATEVHTSS2MCS0) ? "VHTSS2MCS0" : \
> > -(rate == DESC_RATEVHTSS2MCS1) ? "VHTSS2MCS1" : \
> > -(rate == DESC_RATEVHTSS2MCS2) ? "VHTSS2MCS2" : \
> > -(rate == DESC_RATEVHTSS2MCS3) ? "VHTSS2MCS3" : \
> > -(rate == DESC_RATEVHTSS2MCS4) ? "VHTSS2MCS4" : \
> > -(rate == DESC_RATEVHTSS2MCS5) ? "VHTSS2MCS5" : \
> > -(rate == DESC_RATEVHTSS2MCS6) ? "VHTSS2MCS6" : \
> > -(rate == DESC_RATEVHTSS2MCS7) ? "VHTSS2MCS7" : \
> > -(rate == DESC_RATEVHTSS2MCS8) ? "VHTSS2MCS8" : \
> > -(rate == DESC_RATEVHTSS2MCS9) ? "VHTSS2MCS9" : "UNKNOWN"
> > +(rate == DESC_RATEMCS15) ? "MCS15" : "UNKNOWN"
> >
> >
> > enum{
> > diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> > index 3d95ab1986b1..c966d0e3e5ae 100644
> > --- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> > +++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
> > @@ -19,10 +19,6 @@ enum rate_section {
> > HT_MCS8_MCS15,
> > HT_MCS16_MCS23,
> > HT_MCS24_MCS31,
> > - VHT_1SSMCS0_1SSMCS9,
> > - VHT_2SSMCS0_2SSMCS9,
> > - VHT_3SSMCS0_3SSMCS9,
> > - VHT_4SSMCS0_4SSMCS9,
> > };
> >
> > enum {
> > diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
> > index ac88bd30b097..378c21595e05 100644
> > --- a/drivers/staging/rtl8723bs/include/ieee80211.h
> > +++ b/drivers/staging/rtl8723bs/include/ieee80211.h
> > @@ -60,7 +60,6 @@ enum {
> > #define WLAN_STA_HT BIT(11)
> > #define WLAN_STA_WPS BIT(12)
> > #define WLAN_STA_MAYBE_WPS BIT(13)
> > -#define WLAN_STA_VHT BIT(14)
> > #define WLAN_STA_NONERP BIT(31)
> >
> > #define IEEE_CMD_SET_WPA_PARAM 1
> > @@ -135,8 +134,6 @@ enum {
> > RATEID_IDX_BG = 6,
> > RATEID_IDX_G = 7,
> > RATEID_IDX_B = 8,
> > - RATEID_IDX_VHT_2SS = 9,
> > - RATEID_IDX_VHT_1SS = 10,
> > };
> >
> > enum network_type {
> > @@ -424,51 +421,10 @@ enum {
> > MGN_MCS29,
> > MGN_MCS30,
> > MGN_MCS31,
> > - MGN_VHT1SS_MCS0,
> > - MGN_VHT1SS_MCS1,
> > - MGN_VHT1SS_MCS2,
> > - MGN_VHT1SS_MCS3,
> > - MGN_VHT1SS_MCS4,
> > - MGN_VHT1SS_MCS5,
> > - MGN_VHT1SS_MCS6,
> > - MGN_VHT1SS_MCS7,
> > - MGN_VHT1SS_MCS8,
> > - MGN_VHT1SS_MCS9,
> > - MGN_VHT2SS_MCS0,
> > - MGN_VHT2SS_MCS1,
> > - MGN_VHT2SS_MCS2,
> > - MGN_VHT2SS_MCS3,
> > - MGN_VHT2SS_MCS4,
> > - MGN_VHT2SS_MCS5,
> > - MGN_VHT2SS_MCS6,
> > - MGN_VHT2SS_MCS7,
> > - MGN_VHT2SS_MCS8,
> > - MGN_VHT2SS_MCS9,
> > - MGN_VHT3SS_MCS0,
> > - MGN_VHT3SS_MCS1,
> > - MGN_VHT3SS_MCS2,
> > - MGN_VHT3SS_MCS3,
> > - MGN_VHT3SS_MCS4,
> > - MGN_VHT3SS_MCS5,
> > - MGN_VHT3SS_MCS6,
> > - MGN_VHT3SS_MCS7,
> > - MGN_VHT3SS_MCS8,
> > - MGN_VHT3SS_MCS9,
> > - MGN_VHT4SS_MCS0,
> > - MGN_VHT4SS_MCS1,
> > - MGN_VHT4SS_MCS2,
> > - MGN_VHT4SS_MCS3,
> > - MGN_VHT4SS_MCS4,
> > - MGN_VHT4SS_MCS5,
> > - MGN_VHT4SS_MCS6,
> > - MGN_VHT4SS_MCS7,
> > - MGN_VHT4SS_MCS8,
> > - MGN_VHT4SS_MCS9,
> > MGN_UNKNOWN
> > };
> >
> > #define IS_HT_RATE(_rate) (_rate >= MGN_MCS0 && _rate <= MGN_MCS31)
> > -#define IS_VHT_RATE(_rate) (_rate >= MGN_VHT1SS_MCS0 && _rate <= MGN_VHT4SS_MCS9)
> > #define IS_CCK_RATE(_rate) (MGN_1M == _rate || _rate == MGN_2M || _rate == MGN_5_5M || _rate == MGN_11M)
> > #define IS_OFDM_RATE(_rate) (MGN_6M <= _rate && _rate <= MGN_54M && _rate != MGN_11M)
> >
> > @@ -625,7 +581,6 @@ enum {
> > RTW_WLAN_CATEGORY_TDLS = 12,
> > RTW_WLAN_CATEGORY_SELF_PROTECTED = 15, /* add for CONFIG_IEEE80211W, none 11w also can use */
> > RTW_WLAN_CATEGORY_WMM = 17,
> > - RTW_WLAN_CATEGORY_VHT = 21,
> > RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
> > };
> >
> > diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> > index 56bdc14af47d..9dd329a5208a 100644
> > --- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> > +++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
> > @@ -402,27 +402,6 @@ struct txdesc_8723b {
> > #define DESC8723B_RATEMCS13 0x19
> > #define DESC8723B_RATEMCS14 0x1a
> > #define DESC8723B_RATEMCS15 0x1b
> > -#define DESC8723B_RATEVHTSS1MCS0 0x2c
> > -#define DESC8723B_RATEVHTSS1MCS1 0x2d
> > -#define DESC8723B_RATEVHTSS1MCS2 0x2e
> > -#define DESC8723B_RATEVHTSS1MCS3 0x2f
> > -#define DESC8723B_RATEVHTSS1MCS4 0x30
> > -#define DESC8723B_RATEVHTSS1MCS5 0x31
> > -#define DESC8723B_RATEVHTSS1MCS6 0x32
> > -#define DESC8723B_RATEVHTSS1MCS7 0x33
> > -#define DESC8723B_RATEVHTSS1MCS8 0x34
> > -#define DESC8723B_RATEVHTSS1MCS9 0x35
> > -#define DESC8723B_RATEVHTSS2MCS0 0x36
> > -#define DESC8723B_RATEVHTSS2MCS1 0x37
> > -#define DESC8723B_RATEVHTSS2MCS2 0x38
> > -#define DESC8723B_RATEVHTSS2MCS3 0x39
> > -#define DESC8723B_RATEVHTSS2MCS4 0x3a
> > -#define DESC8723B_RATEVHTSS2MCS5 0x3b
> > -#define DESC8723B_RATEVHTSS2MCS6 0x3c
> > -#define DESC8723B_RATEVHTSS2MCS7 0x3d
> > -#define DESC8723B_RATEVHTSS2MCS8 0x3e
> > -#define DESC8723B_RATEVHTSS2MCS9 0x3f
> > -
> >
> > #define RX_HAL_IS_CCK_RATE_8723B(pDesc)\
> > (GET_RX_STATUS_DESC_RX_RATE_8723B(pDesc) == DESC8723B_RATE1M ||\
> > diff --git a/drivers/staging/rtl8723bs/include/rtw_ht.h b/drivers/staging/rtl8723bs/include/rtw_ht.h
> > index e3f353fe1e47..1527d8be2d7a 100644
> > --- a/drivers/staging/rtl8723bs/include/rtw_ht.h
> > +++ b/drivers/staging/rtl8723bs/include/rtw_ht.h
> > @@ -42,10 +42,6 @@ enum {
> > HT_AGG_SIZE_16K = 1,
> > HT_AGG_SIZE_32K = 2,
> > HT_AGG_SIZE_64K = 3,
> > - VHT_AGG_SIZE_128K = 4,
> > - VHT_AGG_SIZE_256K = 5,
> > - VHT_AGG_SIZE_512K = 6,
> > - VHT_AGG_SIZE_1024K = 7,
> > };
> >
> > enum {
> >
>
thank you,
fabio
Hi Fabio,
On 6/22/21 11:16 AM, Fabio Aiuto wrote:
> Hello Hans,
>
> On Mon, Jun 21, 2021 at 11:45:39AM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 6/19/21 12:47 PM, Fabio Aiuto wrote:
>>> remove VHT dead code, as the device doesn't support
>>> VHT (which is a 802.11ac capability).
>>>
>>> Signed-off-by: Fabio Aiuto <[email protected]>
>>> ---
>>> drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 1 -
>>> drivers/staging/rtl8723bs/hal/hal_com.c | 241 -----------
>>> .../staging/rtl8723bs/hal/hal_com_phycfg.c | 383 +-----------------
>>> drivers/staging/rtl8723bs/include/hal_com.h | 62 +--
>>> .../rtl8723bs/include/hal_com_phycfg.h | 4 -
>>> drivers/staging/rtl8723bs/include/ieee80211.h | 45 --
>>> .../staging/rtl8723bs/include/rtl8723b_xmit.h | 21 -
>>> drivers/staging/rtl8723bs/include/rtw_ht.h | 4 -
>>> 8 files changed, 9 insertions(+), 752 deletions(-)
>>>
>>> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
>>> index 285acd3d843b..c128d462c6c7 100644
>>> --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
>>> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
>>> @@ -46,7 +46,6 @@ static struct action_handler OnAction_tbl[] = {
>>> {RTW_WLAN_CATEGORY_UNPROTECTED_WNM, "ACTION_UNPROTECTED_WNM", &DoReserved},
>>> {RTW_WLAN_CATEGORY_SELF_PROTECTED, "ACTION_SELF_PROTECTED", &DoReserved},
>>> {RTW_WLAN_CATEGORY_WMM, "ACTION_WMM", &DoReserved},
>>> - {RTW_WLAN_CATEGORY_VHT, "ACTION_VHT", &DoReserved},
>>> {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &DoReserved},
>>> };
>>>
>>> diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
>>> index 7a88447f8294..eebd48438733 100644
>>> --- a/drivers/staging/rtl8723bs/hal/hal_com.c
>>> +++ b/drivers/staging/rtl8723bs/hal/hal_com.c
>>> @@ -295,126 +295,6 @@ u8 MRateToHwRate(u8 rate)
>>> case MGN_MCS31:
>>> ret = DESC_RATEMCS31;
>>> break;
>>> - case MGN_VHT1SS_MCS0:
>>> - ret = DESC_RATEVHTSS1MCS0;
>>> - break;
>>> - case MGN_VHT1SS_MCS1:
>>> - ret = DESC_RATEVHTSS1MCS1;
>>> - break;
>>> - case MGN_VHT1SS_MCS2:
>>> - ret = DESC_RATEVHTSS1MCS2;
>>> - break;
>>> - case MGN_VHT1SS_MCS3:
>>> - ret = DESC_RATEVHTSS1MCS3;
>>> - break;
>>> - case MGN_VHT1SS_MCS4:
>>> - ret = DESC_RATEVHTSS1MCS4;
>>> - break;
>>> - case MGN_VHT1SS_MCS5:
>>> - ret = DESC_RATEVHTSS1MCS5;
>>> - break;
>>> - case MGN_VHT1SS_MCS6:
>>> - ret = DESC_RATEVHTSS1MCS6;
>>> - break;
>>> - case MGN_VHT1SS_MCS7:
>>> - ret = DESC_RATEVHTSS1MCS7;
>>> - break;
>>> - case MGN_VHT1SS_MCS8:
>>> - ret = DESC_RATEVHTSS1MCS8;
>>> - break;
>>> - case MGN_VHT1SS_MCS9:
>>> - ret = DESC_RATEVHTSS1MCS9;
>>> - break;
>>> - case MGN_VHT2SS_MCS0:
>>> - ret = DESC_RATEVHTSS2MCS0;
>>> - break;
>>> - case MGN_VHT2SS_MCS1:
>>> - ret = DESC_RATEVHTSS2MCS1;
>>> - break;
>>> - case MGN_VHT2SS_MCS2:
>>> - ret = DESC_RATEVHTSS2MCS2;
>>> - break;
>>> - case MGN_VHT2SS_MCS3:
>>> - ret = DESC_RATEVHTSS2MCS3;
>>> - break;
>>> - case MGN_VHT2SS_MCS4:
>>> - ret = DESC_RATEVHTSS2MCS4;
>>> - break;
>>> - case MGN_VHT2SS_MCS5:
>>> - ret = DESC_RATEVHTSS2MCS5;
>>> - break;
>>> - case MGN_VHT2SS_MCS6:
>>> - ret = DESC_RATEVHTSS2MCS6;
>>> - break;
>>> - case MGN_VHT2SS_MCS7:
>>> - ret = DESC_RATEVHTSS2MCS7;
>>> - break;
>>> - case MGN_VHT2SS_MCS8:
>>> - ret = DESC_RATEVHTSS2MCS8;
>>> - break;
>>> - case MGN_VHT2SS_MCS9:
>>> - ret = DESC_RATEVHTSS2MCS9;
>>> - break;
>>> - case MGN_VHT3SS_MCS0:
>>> - ret = DESC_RATEVHTSS3MCS0;
>>> - break;
>>> - case MGN_VHT3SS_MCS1:
>>> - ret = DESC_RATEVHTSS3MCS1;
>>> - break;
>>> - case MGN_VHT3SS_MCS2:
>>> - ret = DESC_RATEVHTSS3MCS2;
>>> - break;
>>> - case MGN_VHT3SS_MCS3:
>>> - ret = DESC_RATEVHTSS3MCS3;
>>> - break;
>>> - case MGN_VHT3SS_MCS4:
>>> - ret = DESC_RATEVHTSS3MCS4;
>>> - break;
>>> - case MGN_VHT3SS_MCS5:
>>> - ret = DESC_RATEVHTSS3MCS5;
>>> - break;
>>> - case MGN_VHT3SS_MCS6:
>>> - ret = DESC_RATEVHTSS3MCS6;
>>> - break;
>>> - case MGN_VHT3SS_MCS7:
>>> - ret = DESC_RATEVHTSS3MCS7;
>>> - break;
>>> - case MGN_VHT3SS_MCS8:
>>> - ret = DESC_RATEVHTSS3MCS8;
>>> - break;
>>> - case MGN_VHT3SS_MCS9:
>>> - ret = DESC_RATEVHTSS3MCS9;
>>> - break;
>>> - case MGN_VHT4SS_MCS0:
>>> - ret = DESC_RATEVHTSS4MCS0;
>>> - break;
>>> - case MGN_VHT4SS_MCS1:
>>> - ret = DESC_RATEVHTSS4MCS1;
>>> - break;
>>> - case MGN_VHT4SS_MCS2:
>>> - ret = DESC_RATEVHTSS4MCS2;
>>> - break;
>>> - case MGN_VHT4SS_MCS3:
>>> - ret = DESC_RATEVHTSS4MCS3;
>>> - break;
>>> - case MGN_VHT4SS_MCS4:
>>> - ret = DESC_RATEVHTSS4MCS4;
>>> - break;
>>> - case MGN_VHT4SS_MCS5:
>>> - ret = DESC_RATEVHTSS4MCS5;
>>> - break;
>>> - case MGN_VHT4SS_MCS6:
>>> - ret = DESC_RATEVHTSS4MCS6;
>>> - break;
>>> - case MGN_VHT4SS_MCS7:
>>> - ret = DESC_RATEVHTSS4MCS7;
>>> - break;
>>> - case MGN_VHT4SS_MCS8:
>>> - ret = DESC_RATEVHTSS4MCS8;
>>> - break;
>>> - case MGN_VHT4SS_MCS9:
>>> - ret = DESC_RATEVHTSS4MCS9;
>>> - break;
>>> default:
>>> break;
>>> }
>>> @@ -559,127 +439,6 @@ u8 HwRateToMRate(u8 rate)
>>> case DESC_RATEMCS31:
>>> ret_rate = MGN_MCS31;
>>> break;
>>> - case DESC_RATEVHTSS1MCS0:
>>> - ret_rate = MGN_VHT1SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS1:
>>> - ret_rate = MGN_VHT1SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS2:
>>> - ret_rate = MGN_VHT1SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS3:
>>> - ret_rate = MGN_VHT1SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS4:
>>> - ret_rate = MGN_VHT1SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS5:
>>> - ret_rate = MGN_VHT1SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS6:
>>> - ret_rate = MGN_VHT1SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS7:
>>> - ret_rate = MGN_VHT1SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS8:
>>> - ret_rate = MGN_VHT1SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS1MCS9:
>>> - ret_rate = MGN_VHT1SS_MCS9;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS0:
>>> - ret_rate = MGN_VHT2SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS1:
>>> - ret_rate = MGN_VHT2SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS2:
>>> - ret_rate = MGN_VHT2SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS3:
>>> - ret_rate = MGN_VHT2SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS4:
>>> - ret_rate = MGN_VHT2SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS5:
>>> - ret_rate = MGN_VHT2SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS6:
>>> - ret_rate = MGN_VHT2SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS7:
>>> - ret_rate = MGN_VHT2SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS8:
>>> - ret_rate = MGN_VHT2SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS2MCS9:
>>> - ret_rate = MGN_VHT2SS_MCS9;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS0:
>>> - ret_rate = MGN_VHT3SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS1:
>>> - ret_rate = MGN_VHT3SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS2:
>>> - ret_rate = MGN_VHT3SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS3:
>>> - ret_rate = MGN_VHT3SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS4:
>>> - ret_rate = MGN_VHT3SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS5:
>>> - ret_rate = MGN_VHT3SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS6:
>>> - ret_rate = MGN_VHT3SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS7:
>>> - ret_rate = MGN_VHT3SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS8:
>>> - ret_rate = MGN_VHT3SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS3MCS9:
>>> - ret_rate = MGN_VHT3SS_MCS9;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS0:
>>> - ret_rate = MGN_VHT4SS_MCS0;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS1:
>>> - ret_rate = MGN_VHT4SS_MCS1;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS2:
>>> - ret_rate = MGN_VHT4SS_MCS2;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS3:
>>> - ret_rate = MGN_VHT4SS_MCS3;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS4:
>>> - ret_rate = MGN_VHT4SS_MCS4;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS5:
>>> - ret_rate = MGN_VHT4SS_MCS5;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS6:
>>> - ret_rate = MGN_VHT4SS_MCS6;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS7:
>>> - ret_rate = MGN_VHT4SS_MCS7;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS8:
>>> - ret_rate = MGN_VHT4SS_MCS8;
>>> - break;
>>> - case DESC_RATEVHTSS4MCS9:
>>> - ret_rate = MGN_VHT4SS_MCS9;
>>> - break;
>>> -
>>> default:
>>> break;
>>> }
>>> diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
>>> index 395eb3b5af71..bb7941aee0c4 100644
>>> --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
>>> +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
>>> @@ -39,18 +39,6 @@ u8 PHY_GetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
>>> case HT_MCS24_MCS31:
>>> value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5];
>>> break;
>>> - case VHT_1SSMCS0_1SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6];
>>> - break;
>>> - case VHT_2SSMCS0_2SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7];
>>> - break;
>>> - case VHT_3SSMCS0_3SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8];
>>> - break;
>>> - case VHT_4SSMCS0_4SSMCS9:
>>> - value = pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9];
>>> - break;
>>> default:
>>> break;
>>> }
>>> @@ -91,18 +79,6 @@ phy_SetTxPowerByRateBase(
>>> case HT_MCS24_MCS31:
>>> pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][5] = Value;
>>> break;
>>> - case VHT_1SSMCS0_1SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][6] = Value;
>>> - break;
>>> - case VHT_2SSMCS0_2SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][7] = Value;
>>> - break;
>>> - case VHT_3SSMCS0_3SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][8] = Value;
>>> - break;
>>> - case VHT_4SSMCS0_4SSMCS9:
>>> - pHalData->TxPwrByRateBase2_4G[RfPath][TxNum][9] = Value;
>>> - break;
>>> default:
>>> break;
>>> }
>>> @@ -131,14 +107,6 @@ struct adapter *padapter
>>> base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_MCS23);
>>> phy_SetTxPowerByRateBase(padapter, path, HT_MCS16_MCS23, RF_3TX, base);
>>>
>>> - base = PHY_GetTxPowerByRate(padapter, path, RF_1TX, MGN_VHT1SS_MCS7);
>>> - phy_SetTxPowerByRateBase(padapter, path, VHT_1SSMCS0_1SSMCS9, RF_1TX, base);
>>> -
>>> - base = PHY_GetTxPowerByRate(padapter, path, RF_2TX, MGN_VHT2SS_MCS7);
>>> - phy_SetTxPowerByRateBase(padapter, path, VHT_2SSMCS0_2SSMCS9, RF_2TX, base);
>>> -
>>> - base = PHY_GetTxPowerByRate(padapter, path, RF_3TX, MGN_VHT3SS_MCS7);
>>> - phy_SetTxPowerByRateBase(padapter, path, VHT_3SSMCS0_3SSMCS9, RF_3TX, base);
>>
>> You are removing a bunch of register writes from a block here, while keeping others,
>> so this does not seem like it is just dead-code removal it feels like you are
>> actually making a functional change.
>
> I looked deeply at what I deed, and I just removed some functions updating tables
> in memory, no register write here. Tables are used to load Tx Power Limit. So
> removing these function calls according with the removal of the VHT enum items
> grants that wrong Power Limits will never be fetched.
>
> Moreover I have been quite conservative, for I left untouched HT indexes above
> 7 which rtl8723bs doesn't support.
>
> So IMO I think this patch is fine as is...
>> Perhaps this entire block can never be executed ?
>
> the block is executed but there's no register write happening. Just
> updating of values which will never be fetched.
Ack, my bad I was under the impression that phy_SetTxPowerByRateBase()
would actually do a register write, but I checked and it just updates
some unused table values, so dropping this code is fine and you can
keep this patch for v2 of the patch set.
Regards,
Hans
On Tue, Jun 22, 2021 at 11:19:36AM +0200, Hans de Goede wrote:
Hi Hans,
> Hi Fabio,
>
> > Moreover I have been quite conservative, for I left untouched HT indexes above
> > 7 which rtl8723bs doesn't support.
> >
> > So IMO I think this patch is fine as is...
> >> Perhaps this entire block can never be executed ?
> >
> > the block is executed but there's no register write happening. Just
> > updating of values which will never be fetched.
>
> Ack, my bad I was under the impression that phy_SetTxPowerByRateBase()
> would actually do a register write, but I checked and it just updates
> some unused table values, so dropping this code is fine and you can
> keep this patch for v2 of the patch set.
>
> Regards,
>
> Hans
>
thank you, what do you think about what I replied about patch 1, shall
I remove the '> 14 if block' or leave it as is? Do you think is necessary
to keep the conditions inside the block and pack them?
I would leave as is but is my opinion...
regards,
fabio
Hi Fabio,
On 6/22/21 11:57 AM, Fabio Aiuto wrote:
> On Tue, Jun 22, 2021 at 11:19:36AM +0200, Hans de Goede wrote:
>
> Hi Hans,
>
>> Hi Fabio,
>>
>>> Moreover I have been quite conservative, for I left untouched HT indexes above
>>> 7 which rtl8723bs doesn't support.
>>>
>>> So IMO I think this patch is fine as is...
>>>> Perhaps this entire block can never be executed ?
>>>
>>> the block is executed but there's no register write happening. Just
>>> updating of values which will never be fetched.
>>
>> Ack, my bad I was under the impression that phy_SetTxPowerByRateBase()
>> would actually do a register write, but I checked and it just updates
>> some unused table values, so dropping this code is fine and you can
>> keep this patch for v2 of the patch set.
>>
>> Regards,
>>
>> Hans
>>
>
> thank you, what do you think about what I replied about patch 1,
I somehow did not receive your reply, so I've just read it on the archives.
> shall
> I remove the '> 14 if block' or leave it as is?
I think it would be best to keep the '> 14 if block' for now and
remove all of them in a later patch-series (I assume there will
be more of them).
> Do you think is necessary
> to keep the conditions inside the block and pack them?
You could also remove the condition and just set
the band to WIRELESS_INVALID unconditionally as you
suggest, that is fine.
But if you keep the condition, like you did in v1 of the
patch, then you must pack the 2 masks together.
Regards,
Hans