Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-updates-src > by-pkgid > 45e4f5da4952e351d997dd2c88575427 > files > 12

kernel-5.3.2-1.mga7.src.rpm

Fix:

3rdparty/rtl8723de/os_dep/linux/os_intfs.c:1210:22: warning: initialization of 'u16 (*)(struct net_device *, struct sk_buff *, struct net_device *)' {aka 'short unsigned int (*)(struct net_d
evice *, struct sk_buff *, struct net_device *)'} from incompatible pointer type 'u16 (*)(struct net_device *, struct sk_buff *, struct net_device *, u16 (*)(struct net_device *, struct sk_b
uff *, struct net_device *))' {aka 'short unsigned int (*)(struct net_device *, struct sk_buff *, struct net_device *, short unsigned int (*)(struct net_device *, struct sk_buff *, struct ne
t_device *))'} [-Wincompatible-pointer-types]
  .ndo_select_queue = rtw_select_queue,
                      ^~~~~~~~~~~~~~~~

Signed-off-by: Thomas Backlund <tmb@mageia.org>

--- linux-5.2/3rdparty/rtl8723de/os_dep/linux/os_intfs.c.orig	2019-08-01 21:59:43.246137906 +0300
+++ linux-5.2/3rdparty/rtl8723de/os_dep/linux/os_intfs.c	2019-08-01 22:12:45.763091264 +0300
@@ -1075,14 +1075,8 @@ unsigned int rtw_classify8021d(struct sk
 }
 
 
-static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
-	, struct net_device *sb_dev
-	#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
-	, select_queue_fallback_t fallback
-	#endif
-#endif
-)
+static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
+			    struct net_device *sb_dev)
 {
 	_adapter	*padapter = rtw_netdev_priv(dev);
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;