From 7ab8d6288d55f634bafda5de5beb105f61d4163d Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Fri, 16 Aug 2019 14:55:13 -0400 Subject: [PATCH] fix 8189es for 5.3.y compatibility --- .../wifi-3002-add-realtek-8189es.patch | 77 +++++++++++++++---- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/patch/kernel/sunxi-dev/wifi-3002-add-realtek-8189es.patch b/patch/kernel/sunxi-dev/wifi-3002-add-realtek-8189es.patch index 8d72c53b2..6552e3689 100644 --- a/patch/kernel/sunxi-dev/wifi-3002-add-realtek-8189es.patch +++ b/patch/kernel/sunxi-dev/wifi-3002-add-realtek-8189es.patch @@ -347093,7 +347093,7 @@ new file mode 100644 index 0000000..c50d2fb --- /dev/null +++ b/drivers/net/wireless/rtl8189es/os_dep/linux/rtw_cfgvendor.c -@@ -0,0 +1,1350 @@ +@@ -0,0 +1,1395 @@ +/****************************************************************************** + * + * Copyright(c) 2007 - 2014 Realtek Corporation. All rights reserved. @@ -348278,7 +348278,10 @@ index 0000000..c50d2fb + .subcmd = RTK_VENDOR_SCMD_PRIV_STR + }, + .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 + { @@ -348287,7 +348290,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES + }, + .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 + }, + { + { @@ -348295,7 +348301,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_SET_CONFIG + }, + .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 + }, + { + { @@ -348303,7 +348312,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG + }, + .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 + }, + { + { @@ -348311,7 +348323,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN + }, + .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 + }, + { + { @@ -348319,7 +348334,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS + }, + .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 + }, + { + { @@ -348327,7 +348345,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_SET_HOTLIST + }, + .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 + }, + { + { @@ -348335,7 +348356,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG + }, + .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 + }, + { + { @@ -348343,7 +348367,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS + }, + .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 + }, + { + { @@ -348351,7 +348378,10 @@ index 0000000..c50d2fb + .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST + }, + .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 */ +#if defined(RTT_SUPPORT) && 0 @@ -348361,7 +348391,10 @@ index 0000000..c50d2fb + .subcmd = RTT_SUBCMD_SET_CONFIG + }, + .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 + }, + { + { @@ -348369,7 +348402,10 @@ index 0000000..c50d2fb + .subcmd = RTT_SUBCMD_CANCEL_CONFIG + }, + .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 + }, + { + { @@ -348377,7 +348413,10 @@ index 0000000..c50d2fb + .subcmd = RTT_SUBCMD_GETCAPABILITY + }, + .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 */ + { @@ -348386,7 +348425,10 @@ index 0000000..c50d2fb + .subcmd = ANDR_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, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + }, + { + { @@ -348394,7 +348436,10 @@ index 0000000..c50d2fb + .subcmd = ANDR_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, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)) ++ .policy = VENDOR_CMD_RAW_DATA, ++#endif + } +}; +