From 7d1c32cd06c152d31e531784e6fb1d4efedd7863 Mon Sep 17 00:00:00 2001 From: Hansruedi Patzen Date: Wed, 15 May 2019 14:25:00 +0200 Subject: [PATCH] linux-5.2: disable fallback from rtw_select_queue The fallback parameter has been removed in the latest kernel (>= 5.2) See: https://github.com/torvalds/linux/commit/a350eccee5830d9a1f29e393a88dc05a15326d44 --- os_dep/linux/os_intfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 09c54e5..5f6f8e9 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1058,11 +1058,14 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) return dscp >> 5; } - static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) + #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)) , void *accel_priv - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) + #else + , struct net_device *sb_dev + #endif + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)) , select_queue_fallback_t fallback #endif #endif