random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2025-10-13 20:36:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from HonJEK/linux_5.3_fix

Browse Source 
Fix operations with kernel 5.3
This commit is contained in:
lwfinger 2019-11-04 11:00:53 -06:00 committed by GitHub
commit 0962017310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
os_dep/linux/os_intfs.c
View File

@ -1069,14 +1069,15 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
,struct net_device *sb_dev #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
,select_queue_fallback_t fallback , void *accel_priv
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) #else
,void *unused , struct net_device *sb_dev
,select_queue_fallback_t fallback #endif
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0))
, void *accel_priv , select_queue_fallback_t fallback
#endif
#endif #endif
) )
{ {

75
os_dep/linux/rtw_cfgvendor.c
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
} }
}; };