Skip to content

L
linux
Commit fc2cda0f authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8723bs: remove VHT dead code 

remove VHT dead code, as the device doesn't support
VHT (which is a 802.11ac capability).
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/2ca4be24e401bd862a96e2641a9b0377be36a25d.1624367072.git.fabioaiuto83@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e749e6f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 752 deletions
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
View file @ fc2cda0f
......@@ -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},
};
......
drivers/staging/rtl8723bs/hal/hal_com.c
View file @ fc2cda0f
......@@ -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;
}
......
drivers/staging/rtl8723bs/include/hal_com.h
View file @ fc2cda0f
......@@ -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{
......
drivers/staging/rtl8723bs/include/hal_com_phycfg.h
View file @ fc2cda0f
......@@ -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 {
......
drivers/staging/rtl8723bs/include/ieee80211.h
View file @ fc2cda0f
......@@ -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 */
};
......
drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
View file @ fc2cda0f
......@@ -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 ||\
......
drivers/staging/rtl8723bs/include/rtw_ht.h
View file @ fc2cda0f
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7