Merge branch 'linux_5.2_fix' into linux_5.3_fix

This commit is contained in:
John-Eric Kamps 2019-11-04 11:12:18 +01:00
commit 0addd37c8d

View File

@ -1069,14 +1069,15 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
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(4, 19, 0)) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
,struct net_device *sb_dev #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
,select_queue_fallback_t fallback , void *accel_priv
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) #else
,void *unused , struct net_device *sb_dev
,select_queue_fallback_t fallback #endif
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0))
, void *accel_priv , select_queue_fallback_t fallback
#endif
#endif #endif
) )
{ {