Fix operations with kernel 5.3

Based on lwfinger/rtlwifi_new/commit/2b3cb6be0aed5cbcd4318a7e63d39e499b5094c0#diff-839e3ea33b3a136b794f7a0281eead7c

Signed-off-by: John-Eric Kamps <john-eric.kamps@honeywell.com>
This commit is contained in:
John-Eric Kamps
2019-11-04 10:56:09 +01:00
parent fd4403497d
commit f418909778
+60 -15
View File
@@ -1161,7 +1161,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = BRCM_VENDOR_SCMD_PRIV_STR .subcmd = BRCM_VENDOR_SCMD_PRIV_STR
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_priv_string_handler .doit = wl_cfgvendor_priv_string_handler,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
#if defined(GSCAN_SUPPORT) && 0 #if defined(GSCAN_SUPPORT) && 0
{ {
@@ -1170,7 +1173,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_GET_CAPABILITIES .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_gscan_get_capabilities .doit = wl_cfgvendor_gscan_get_capabilities,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1178,7 +1184,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_SET_CONFIG .subcmd = GSCAN_SUBCMD_SET_CONFIG
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_set_scan_cfg .doit = wl_cfgvendor_set_scan_cfg,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1186,7 +1195,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_set_batch_scan_cfg .doit = wl_cfgvendor_set_batch_scan_cfg,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1194,7 +1206,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_ENABLE_GSCAN .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_initiate_gscan .doit = wl_cfgvendor_initiate_gscan,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1202,7 +1217,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_enable_full_scan_result .doit = wl_cfgvendor_enable_full_scan_result,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1210,7 +1228,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_SET_HOTLIST .subcmd = GSCAN_SUBCMD_SET_HOTLIST
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_hotlist_cfg .doit = wl_cfgvendor_hotlist_cfg,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1218,7 +1239,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_significant_change_cfg .doit = wl_cfgvendor_significant_change_cfg,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1226,7 +1250,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_gscan_get_batch_results .doit = wl_cfgvendor_gscan_get_batch_results,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1234,7 +1261,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_gscan_get_channel_list .doit = wl_cfgvendor_gscan_get_channel_list,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
#endif /* GSCAN_SUPPORT */ #endif /* GSCAN_SUPPORT */
#if defined(RTT_SUPPORT) && 0 #if defined(RTT_SUPPORT) && 0
@@ -1244,7 +1274,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = RTT_SUBCMD_SET_CONFIG .subcmd = RTT_SUBCMD_SET_CONFIG
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_rtt_set_config .doit = wl_cfgvendor_rtt_set_config,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1252,7 +1285,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = RTT_SUBCMD_CANCEL_CONFIG .subcmd = RTT_SUBCMD_CANCEL_CONFIG
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_rtt_cancel_config .doit = wl_cfgvendor_rtt_cancel_config,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1260,7 +1296,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = RTT_SUBCMD_GETCAPABILITY .subcmd = RTT_SUBCMD_GETCAPABILITY
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = wl_cfgvendor_rtt_get_capability .doit = wl_cfgvendor_rtt_get_capability,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
#endif /* RTT_SUPPORT */ #endif /* RTT_SUPPORT */
{ {
@@ -1269,7 +1308,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = rtw_cfgvendor_get_feature_set .doit = rtw_cfgvendor_get_feature_set,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
}, },
{ {
{ {
@@ -1277,7 +1319,10 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
.subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX
}, },
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = rtw_cfgvendor_get_feature_set_matrix .doit = rtw_cfgvendor_get_feature_set_matrix,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
.policy = VENDOR_CMD_RAW_DATA,
#endif
} }
}; };