From a89842487398157cf91487acb414ccfe42a16331 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Sat, 10 Aug 2019 15:16:23 -0400 Subject: [PATCH] fix 8189fs and 8723cs patches to make them 5.3.y compatible --- .../wifi-4002-add-realtek-8723cs.patch | 77 +++++++++++++++---- .../sunxi-dev/wifi-add-realtek-8189fs.patch | 77 +++++++++++++++---- 2 files changed, 122 insertions(+), 32 deletions(-) diff --git a/patch/kernel/sunxi-dev/wifi-4002-add-realtek-8723cs.patch b/patch/kernel/sunxi-dev/wifi-4002-add-realtek-8723cs.patch index eab7f69123..69d37ec09d 100644 --- a/patch/kernel/sunxi-dev/wifi-4002-add-realtek-8723cs.patch +++ b/patch/kernel/sunxi-dev/wifi-4002-add-realtek-8723cs.patch @@ -338818,7 +338818,7 @@ new file mode 100644 index 00000000..13e07482 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8723cs/os_dep/linux/rtw_cfgvendor.c -@@ -0,0 +1,1340 @@ +@@ -0,0 +1,1385 @@ +/****************************************************************************** + * + * Copyright(c) 2007 - 2014 Realtek Corporation. All rights reserved. @@ -339993,7 +339993,10 @@ index 00000000..13e07482 + .subcmd = BRCM_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 + { @@ -340002,7 +340005,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340010,7 +340016,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340018,7 +340027,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340026,7 +340038,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340034,7 +340049,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340042,7 +340060,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340050,7 +340071,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340058,7 +340082,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340066,7 +340093,10 @@ index 00000000..13e07482 + .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 @@ -340076,7 +340106,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340084,7 +340117,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340092,7 +340128,10 @@ index 00000000..13e07482 + .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 */ + { @@ -340101,7 +340140,10 @@ index 00000000..13e07482 + .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 + }, + { + { @@ -340109,7 +340151,10 @@ index 00000000..13e07482 + .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 + } +}; + diff --git a/patch/kernel/sunxi-dev/wifi-add-realtek-8189fs.patch b/patch/kernel/sunxi-dev/wifi-add-realtek-8189fs.patch index 5df0143c6d..7ef31ed118 100644 --- a/patch/kernel/sunxi-dev/wifi-add-realtek-8189fs.patch +++ b/patch/kernel/sunxi-dev/wifi-add-realtek-8189fs.patch @@ -388298,7 +388298,7 @@ new file mode 100644 index 0000000..13e0748 --- /dev/null +++ b/drivers/net/wireless/realtek/rtl8189fs/os_dep/linux/rtw_cfgvendor.c -@@ -0,0 +1,1340 @@ +@@ -0,0 +1,1385 @@ +/****************************************************************************** + * + * Copyright(c) 2007 - 2014 Realtek Corporation. All rights reserved. @@ -389473,7 +389473,10 @@ index 0000000..13e0748 + .subcmd = BRCM_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 + { @@ -389482,7 +389485,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389490,7 +389496,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389498,7 +389507,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389506,7 +389518,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389514,7 +389529,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389522,7 +389540,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389530,7 +389551,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389538,7 +389562,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389546,7 +389573,10 @@ index 0000000..13e0748 + .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 @@ -389556,7 +389586,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389564,7 +389597,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389572,7 +389608,10 @@ index 0000000..13e0748 + .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 */ + { @@ -389581,7 +389620,10 @@ index 0000000..13e0748 + .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 + }, + { + { @@ -389589,7 +389631,10 @@ index 0000000..13e0748 + .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 + } +}; +