Merge pull request #9 from igorpecovnik/v5.3.9

Fix compilation under 4.14.y
This commit is contained in:
Christian Bremvåg 2019-12-29 21:29:34 +01:00 committed by GitHub
commit 5562c10761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1284,18 +1284,18 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
return dscp >> 5; 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
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(4, 19, 0)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)) , void *accel_priv
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
struct net_device *sb_dev,
select_queue_fallback_t fallback)
#else #else
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, , struct net_device *sb_dev
void *accel_priv,
struct select_queue_fallback_t *fallback)
#endif #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); _adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;