From fb36a0c650e5a3e9fec829d03ac8d5a3d5dcda2e Mon Sep 17 00:00:00 2001 From: kimocoder Date: Sun, 2 Dec 2018 20:34:37 +0100 Subject: [PATCH] Update kernel v4.19 support --- include/wifi.h | 8 ++++---- os_dep/linux/os_intfs.c | 16 +++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/wifi.h b/include/wifi.h index b86a24c..d12d3d3 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -1067,10 +1067,10 @@ typedef enum _HT_CAP_AMPDU_DENSITY { * A-PMDU buffer sizes * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) */ -#define IEEE80211_MIN_AMPDU_BUF 0x8 -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)) -#define IEEE80211_MAX_AMPDU_BUF 0x40 -#endif +// #define IEEE80211_MIN_AMPDU_BUF 0x8 +// #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)) +// #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 b0d45f7..3ff7f3e 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1288,13 +1288,15 @@ 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(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 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) + , void *accel_priv + #else + , struct net_device *sb_dev + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) + , select_queue_fallback_t fallback + #endif #endif ) {