diff -Nurp ./3rdparty/rtl8821ce.orig/os_dep/linux/rtw_cfgvendor.c ./3rdparty/rtl8821ce/os_dep/linux/rtw_cfgvendor.c --- ./3rdparty/rtl8821ce.orig/os_dep/linux/rtw_cfgvendor.c 2019-10-17 15:57:52.663962808 +0300 +++ ./3rdparty/rtl8821ce/os_dep/linux/rtw_cfgvendor.c 2019-10-17 16:01:00.329972489 +0300 @@ -1748,7 +1748,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_gscan_get_capabilities + .doit = rtw_cfgvendor_gscan_get_capabilities, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1756,7 +1757,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_SET_CONFIG }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_set_scan_cfg + .doit = rtw_cfgvendor_set_scan_cfg, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1764,7 +1766,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_set_batch_scan_cfg + .doit = rtw_cfgvendor_set_batch_scan_cfg, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1772,7 +1775,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_initiate_gscan + .doit = rtw_cfgvendor_initiate_gscan, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1780,7 +1784,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_enable_full_scan_result + .doit = rtw_cfgvendor_enable_full_scan_result, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1788,7 +1793,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_SET_HOTLIST }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_hotlist_cfg + .doit = rtw_cfgvendor_hotlist_cfg, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1796,7 +1802,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_significant_change_cfg + .doit = rtw_cfgvendor_significant_change_cfg, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1804,7 +1811,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_gscan_get_batch_results + .doit = rtw_cfgvendor_gscan_get_batch_results, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1812,7 +1820,8 @@ static const struct wiphy_vendor_command .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_gscan_get_channel_list + .doit = rtw_cfgvendor_gscan_get_channel_list, + .policy = VENDOR_CMD_RAW_DATA }, #endif /* GSCAN_SUPPORT */ #if defined(RTT_SUPPORT) && 0 @@ -1822,7 +1831,8 @@ static const struct wiphy_vendor_command .subcmd = RTT_SUBCMD_SET_CONFIG }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_rtt_set_config + .doit = rtw_cfgvendor_rtt_set_config, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1830,7 +1840,8 @@ static const struct wiphy_vendor_command .subcmd = RTT_SUBCMD_CANCEL_CONFIG }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_rtt_cancel_config + .doit = rtw_cfgvendor_rtt_cancel_config, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1838,7 +1849,8 @@ static const struct wiphy_vendor_command .subcmd = RTT_SUBCMD_GETCAPABILITY }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_rtt_get_capability + .doit = rtw_cfgvendor_rtt_get_capability, + .policy = VENDOR_CMD_RAW_DATA }, #endif /* RTT_SUPPORT */ #ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS @@ -1848,7 +1860,8 @@ static const struct wiphy_vendor_command .subcmd = LSTATS_SUBCMD_GET_INFO }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_lstats_get_info + .doit = rtw_cfgvendor_lstats_get_info, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1856,7 +1869,8 @@ static const struct wiphy_vendor_command .subcmd = LSTATS_SUBCMD_SET_INFO }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_lstats_set_info + .doit = rtw_cfgvendor_lstats_set_info, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1864,7 +1878,8 @@ static const struct wiphy_vendor_command .subcmd = LSTATS_SUBCMD_CLEAR_INFO }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_lstats_clear_info + .doit = rtw_cfgvendor_lstats_clear_info, + .policy = VENDOR_CMD_RAW_DATA }, #endif /* CONFIG_RTW_CFGVEDNOR_LLSTATS */ #ifdef CONFIG_RTW_CFGVEDNOR_RSSIMONITOR @@ -1874,7 +1889,8 @@ static const struct wiphy_vendor_command .subcmd = WIFI_SUBCMD_SET_RSSI_MONITOR }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_set_rssi_monitor + .doit = rtw_cfgvendor_set_rssi_monitor, + .policy = VENDOR_CMD_RAW_DATA }, #endif /* CONFIG_RTW_CFGVEDNOR_RSSIMONITOR */ #ifdef CONFIG_RTW_CFGVENDOR_WIFI_LOGGER @@ -1884,7 +1900,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_START_LOGGING }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_start_logging + .doit = rtw_cfgvendor_logger_start_logging, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1892,7 +1909,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_GET_FEATURE }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_get_feature + .doit = rtw_cfgvendor_logger_get_feature, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1900,7 +1918,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_GET_VER }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_get_version + .doit = rtw_cfgvendor_logger_get_version, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1908,7 +1927,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_GET_RING_STATUS }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_get_ring_status + .doit = rtw_cfgvendor_logger_get_ring_status, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1916,7 +1936,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_GET_RING_DATA }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_get_ring_data + .doit = rtw_cfgvendor_logger_get_ring_data, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1924,7 +1945,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_TRIGGER_MEM_DUMP }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_get_firmware_memory_dump + .doit = rtw_cfgvendor_logger_get_firmware_memory_dump, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1932,7 +1954,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_START_PKT_FATE_MONITORING }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_start_pkt_fate_monitoring + .doit = rtw_cfgvendor_logger_start_pkt_fate_monitoring, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1940,7 +1963,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_GET_TX_PKT_FATES }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_get_tx_pkt_fates + .doit = rtw_cfgvendor_logger_get_tx_pkt_fates, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1948,7 +1972,8 @@ static const struct wiphy_vendor_command .subcmd = LOGGER_GET_RX_PKT_FATES }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_logger_get_rx_pkt_fates + .doit = rtw_cfgvendor_logger_get_rx_pkt_fates, + .policy = VENDOR_CMD_RAW_DATA }, #endif /* CONFIG_RTW_CFGVENDOR_WIFI_LOGGER */ #ifdef CONFIG_RTW_WIFI_HAL @@ -1959,7 +1984,8 @@ static const struct wiphy_vendor_command .subcmd = WIFI_SUBCMD_SET_PNO_RANDOM_MAC_OUI }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_set_rand_mac_oui + .doit = rtw_cfgvendor_set_rand_mac_oui, + .policy = VENDOR_CMD_RAW_DATA }, #endif { @@ -1968,8 +1994,8 @@ static const struct wiphy_vendor_command .subcmd = WIFI_SUBCMD_NODFS_SET }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_set_nodfs_flag - + .doit = rtw_cfgvendor_set_nodfs_flag, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1977,7 +2003,8 @@ static const struct wiphy_vendor_command .subcmd = WIFI_SUBCMD_SET_COUNTRY_CODE }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_set_country + .doit = rtw_cfgvendor_set_country, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -1985,7 +2012,8 @@ static const struct wiphy_vendor_command .subcmd = WIFI_SUBCMD_CONFIG_ND_OFFLOAD }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_set_nd_offload + .doit = rtw_cfgvendor_set_nd_offload, + .policy = VENDOR_CMD_RAW_DATA }, #endif /* CONFIG_RTW_WIFI_HAL */ { @@ -1994,7 +2022,8 @@ static const struct wiphy_vendor_command .subcmd = WIFI_SUBCMD_GET_FEATURE_SET }, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = rtw_cfgvendor_get_feature_set + .doit = rtw_cfgvendor_get_feature_set, + .policy = VENDOR_CMD_RAW_DATA }, { { @@ -2002,7 +2031,8 @@ static const struct wiphy_vendor_command .subcmd = WIFI_SUBCMD_GET_FEATURE_SET_MATRIX }, .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, + .policy = VENDOR_CMD_RAW_DATA } };