From d25f949b5d65e9bf48ae876dfe3619efa0829e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 29 Dec 2019 19:25:07 +0100 Subject: [PATCH 1/4] Update os_intfs.c --- os_dep/linux/os_intfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index e56914b..d873fd0 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1287,7 +1287,7 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)) static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, struct net_device *sb_dev) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)) +#elif (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) From d0ff060efc9260fafe75b71839fef972577a1a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 29 Dec 2019 19:28:32 +0100 Subject: [PATCH 2/4] Update os_intfs.c --- os_dep/linux/os_intfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index d873fd0..423c47a 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1287,7 +1287,7 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)) static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, struct net_device *sb_dev) -#elif (LINUX_VERSION_CODE > KERNEL_VERSION(4, 19, 0)) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)) static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, struct net_device *sb_dev, select_queue_fallback_t fallback) From 34c6fc7dfca97ccf062495193ad5f837d7607fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 29 Dec 2019 19:57:24 +0100 Subject: [PATCH 3/4] Update os_intfs.c --- os_dep/linux/os_intfs.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 423c47a..a6977e5 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1284,17 +1284,16 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) return dscp >> 5; } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)) -static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, - struct net_device *sb_dev) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 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, - void *accel_priv, - struct select_queue_fallback_t *fallback) +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) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)) + , select_queue_fallback_t fallback + #endif #endif { _adapter *padapter = rtw_netdev_priv(dev); From 2b5c590ab5a081c7f05f1cfd5f5698a10f4e15a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 29 Dec 2019 20:02:23 +0100 Subject: [PATCH 4/4] Update os_intfs.c --- os_dep/linux/os_intfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index a6977e5..d01b91b 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1295,6 +1295,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb , select_queue_fallback_t fallback #endif #endif +) { _adapter *padapter = rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv;