From 072598e0326401544297e2e017ef726efbf093a6 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Wed, 29 Aug 2018 18:27:44 +0200 Subject: [PATCH] Add support for kernel v4.19-rc1 --- dkms.conf | 2 +- hal/rtl8812a/rtl8812a_dm.c | 1 + include/wifi.h | 3 ++- os_dep/linux/os_intfs.c | 8 +++++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dkms.conf b/dkms.conf index ab54802..df0846a 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="realtek-rtl88xxau" -PACKAGE_VERSION="5.2.20.2~20180827" +PACKAGE_VERSION="5.2.20.2~20180829" CLEAN="'make' clean" BUILT_MODULE_NAME[0]=88XXau PROCS_NUM=`nproc` diff --git a/hal/rtl8812a/rtl8812a_dm.c b/hal/rtl8812a/rtl8812a_dm.c index 59cf122..3103201 100644 --- a/hal/rtl8812a/rtl8812a_dm.c +++ b/hal/rtl8812a/rtl8812a_dm.c @@ -344,6 +344,7 @@ void rtl8812_init_dm_priv(IN PADAPTER Adapter) Init_ODM_ComInfo_8812(Adapter); odm_init_all_timers(podmpriv); + pHalData->CurrentTxPwrIdx = 18; } void rtl8812_deinit_dm_priv(IN PADAPTER Adapter) diff --git a/include/wifi.h b/include/wifi.h index 62d55fb..44bf7c8 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -1028,8 +1028,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 +#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 d07bf46..7dc6ab5 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1291,11 +1291,13 @@ 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 - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) , select_queue_fallback_t fallback - #endif #endif ) {