From 20a4b03c88fe800b83bdfbda8db3324b19e06897 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Wed, 15 Aug 2018 12:35:45 +0800 Subject: [PATCH] fix build on 4.19 (tested on next-20180814) Signed-off-by: Icenowy Zheng --- include/wifi.h | 3 ++- os_dep/linux/os_intfs.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wifi.h b/include/wifi.h index 9d21a5a..3c6ef03 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -1006,8 +1006,9 @@ typedef enum _HT_CAP_AMPDU_DENSITY { * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) */ #define IEEE80211_MIN_AMPDU_BUF 0x8 +#ifndef IEEE80211_MAX_AMPDU_BUF #define IEEE80211_MAX_AMPDU_BUF 0x40 - +#endif /* Spatial Multiplexing Power Save Modes */ #define WLAN_HT_CAP_SM_PS_STATIC 0 diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 748a409..923417c 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -848,13 +848,14 @@ unsigned int rtw_classify8021d(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) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) + , struct net_device *sb_dev +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) , void *accel_priv +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) , select_queue_fallback_t fallback #endif - -#endif ) { _adapter *padapter = rtw_netdev_priv(dev);