linux-5.3: adding vendor command policy (#141)

* Fix for kernel 5.3
* Update Travis CI to last mainline and LTS kernels
Fetch from 50da975628
This commit is contained in:
Carlos Garcés 2019-09-19 21:30:52 +02:00 committed by GitHub
parent d899c57f8f
commit e7361e951c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 6 deletions

View File

@ -25,7 +25,7 @@ matrix:
- sourceline: 'ppa:ondrej/nginx-mainline' - sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- libssl1.1 - libssl1.1
env: COMPILER=gcc-5 KVER=5.2-rc2 env: COMPILER=gcc-5 KVER=5.3
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -35,7 +35,7 @@ matrix:
packages: packages:
- gcc-6 - gcc-6
- libssl1.1 - libssl1.1
env: COMPILER=gcc-6 KVER=5.2-rc2 env: COMPILER=gcc-6 KVER=5.3
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -45,7 +45,7 @@ matrix:
packages: packages:
- gcc-7 - gcc-7
- libssl1.1 - libssl1.1
env: COMPILER=gcc-7 KVER=5.2-rc2 env: COMPILER=gcc-7 KVER=5.3
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -53,7 +53,7 @@ matrix:
- sourceline: 'ppa:ondrej/nginx-mainline' - sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- libssl1.1 - libssl1.1
env: COMPILER=gcc-5 KVER=4.19.45 env: COMPILER=gcc-5 KVER=4.19.74
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -63,7 +63,7 @@ matrix:
packages: packages:
- gcc-6 - gcc-6
- libssl1.1 - libssl1.1
env: COMPILER=gcc-6 KVER=4.19.45 env: COMPILER=gcc-6 KVER=4.19.74
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -73,4 +73,4 @@ matrix:
packages: packages:
- gcc-7 - gcc-7
- libssl1.1 - libssl1.1
env: COMPILER=gcc-7 KVER=4.19.45 env: COMPILER=gcc-7 KVER=4.19.74

View File

@ -1172,6 +1172,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_priv_string_handler .doit = wl_cfgvendor_priv_string_handler
}, },
#if defined(GSCAN_SUPPORT) && 0 #if defined(GSCAN_SUPPORT) && 0
@ -1180,6 +1183,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = {
.vendor_id = OUI_GOOGLE, .vendor_id = OUI_GOOGLE,
.subcmd = GSCAN_SUBCMD_GET_CAPABILITIES .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES
}, },
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.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
}, },
@ -1189,6 +1195,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_set_scan_cfg .doit = wl_cfgvendor_set_scan_cfg
}, },
{ {
@ -1197,6 +1206,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_set_batch_scan_cfg .doit = wl_cfgvendor_set_batch_scan_cfg
}, },
{ {
@ -1205,6 +1217,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_initiate_gscan .doit = wl_cfgvendor_initiate_gscan
}, },
{ {
@ -1213,6 +1228,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_enable_full_scan_result .doit = wl_cfgvendor_enable_full_scan_result
}, },
{ {
@ -1221,6 +1239,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_hotlist_cfg .doit = wl_cfgvendor_hotlist_cfg
}, },
{ {
@ -1229,6 +1250,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_significant_change_cfg .doit = wl_cfgvendor_significant_change_cfg
}, },
{ {
@ -1237,6 +1261,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_gscan_get_batch_results .doit = wl_cfgvendor_gscan_get_batch_results
}, },
{ {
@ -1245,6 +1272,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_gscan_get_channel_list .doit = wl_cfgvendor_gscan_get_channel_list
}, },
#endif /* GSCAN_SUPPORT */ #endif /* GSCAN_SUPPORT */
@ -1255,6 +1285,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_rtt_set_config .doit = wl_cfgvendor_rtt_set_config
}, },
{ {
@ -1263,6 +1296,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_rtt_cancel_config .doit = wl_cfgvendor_rtt_cancel_config
}, },
{ {
@ -1271,6 +1307,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = wl_cfgvendor_rtt_get_capability .doit = wl_cfgvendor_rtt_get_capability
}, },
#endif /* RTT_SUPPORT */ #endif /* RTT_SUPPORT */
@ -1280,6 +1319,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = rtw_cfgvendor_get_feature_set .doit = rtw_cfgvendor_get_feature_set
}, },
{ {
@ -1288,6 +1330,9 @@ 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,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0)
.policy = VENDOR_CMD_RAW_DATA,
#endif
.doit = rtw_cfgvendor_get_feature_set_matrix .doit = rtw_cfgvendor_get_feature_set_matrix
} }
}; };