From 19aa60f1a1ef6f4e9ac4833e96700bd78ef4b01d Mon Sep 17 00:00:00 2001 From: kimocoder Date: Sat, 6 Apr 2019 08:43:23 +0200 Subject: [PATCH] Fix build for 4.19.0-041900rc4-generic from ubuntu kernel-ppa --- os_dep/linux/os_intfs.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 3e182a5..d1c8468 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1273,19 +1273,20 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) return dscp >> 5; } - +#if (LINUX_VERSION_CODE>=KERNEL_VERSION(4,19,0)) +static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, + struct net_device *sb_dev, + select_queue_fallback_t fallback) +#else 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 - #else - , struct net_device *sb_dev - #endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - , select_queue_fallback_t fallback - #endif + , void *accel_priv + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) + , select_queue_fallback_t fallback + #endif #endif ) +#endif { _adapter *padapter = rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv;