From 67c5991b70bf10d8a0e7aeef46aa46d044064b0a Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Sun, 14 Jul 2019 19:58:04 +0200 Subject: [PATCH] fix for 5.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c:986:22: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .ndo_select_queue = rtw_select_queue, ^~~~~~~~~~~~~~~~ drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c:986:22: note: (near initialization for ‘rtw_netdev_ops.ndo_select_queue’) --- 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 923417c..ca07a17 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -853,7 +853,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) , void *accel_priv #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) , select_queue_fallback_t fallback #endif )