mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2025-01-19 09:11:34 +00:00
Code Releases Activity

Merge pull request #241 from kimocoder/v5.2.20

Browse Source 
Merge changes
This commit is contained in:
Christian B 2018-12-06 17:43:16 +01:00 committed by GitHub
commit 1906ac34f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -26,6 +26,8 @@ ifeq ($(GCC_VER_49),1)
EXTRA_CFLAGS += -Wno-date-time -Wno-error=date-time # Fix compile error && warning on gcc 4.9 and later EXTRA_CFLAGS += -Wno-date-time -Wno-error=date-time # Fix compile error && warning on gcc 4.9 and later
endif endif
EXTRA_CFLAGS += -Wno-vla
EXTRA_CFLAGS += -I$(src)/include EXTRA_CFLAGS += -I$(src)/include
EXTRA_LDFLAGS += --strip-debug EXTRA_LDFLAGS += --strip-debug

2
dkms.conf
View File

@ -1,5 +1,5 @@
PACKAGE_NAME="realtek-rtl88xxau" PACKAGE_NAME="realtek-rtl88xxau"
PACKAGE_VERSION="5.2.20.2~20180829" PACKAGE_VERSION="5.2.20.2~20181106"
CLEAN="'make' clean" CLEAN="'make' clean"
BUILT_MODULE_NAME[0]=88XXau BUILT_MODULE_NAME[0]=88XXau
PROCS_NUM=`nproc` PROCS_NUM=`nproc`

8
include/wifi.h
View File

@ -1067,10 +1067,10 @@ typedef enum _HT_CAP_AMPDU_DENSITY {
* A-PMDU buffer sizes * A-PMDU buffer sizes
* According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)
*/ */
#define IEEE80211_MIN_AMPDU_BUF 0x8 // #define IEEE80211_MIN_AMPDU_BUF 0x8
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)) // #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0))
#define IEEE80211_MAX_AMPDU_BUF 0x40 // #define IEEE80211_MAX_AMPDU_BUF 0x40
#endif // #endif
/* Spatial Multiplexing Power Save Modes */ /* Spatial Multiplexing Power Save Modes */
#define WLAN_HT_CAP_SM_PS_STATIC 0 #define WLAN_HT_CAP_SM_PS_STATIC 0

4
os_dep/linux/ioctl_cfg80211.c
View File

@ -588,7 +588,11 @@ static u64 rtw_get_systime_us(void)
{ {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
struct timespec ts; struct timespec ts;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0))
getboottime(&ts);
#else
get_monotonic_boottime(&ts); get_monotonic_boottime(&ts);
#endif
return ((u64)ts.tv_sec * 1000000) + ts.tv_nsec / 1000; return ((u64)ts.tv_sec * 1000000) + ts.tv_nsec / 1000;
#else #else
struct timeval tv; struct timeval tv;

17
os_dep/linux/os_intfs.c
View File

@ -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 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)
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
, void *accel_priv , void *accel_priv
#endif #else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) , struct net_device *sb_dev
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
, select_queue_fallback_t fallback , select_queue_fallback_t fallback
#endif
#endif #endif
) )
{ {
@ -2630,6 +2632,8 @@ static int netdev_vir_if_close(struct net_device *pnetdev)
#endif #endif
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
wdev->iftype = NL80211_IFTYPE_MONITOR;
wdev->current_bss = NULL;
rtw_scan_abort(padapter); rtw_scan_abort(padapter);
rtw_cfg80211_wait_scan_req_empty(padapter, 200); rtw_cfg80211_wait_scan_req_empty(padapter, 200);
adapter_wdev_data(padapter)->bandroid_scan = _FALSE; adapter_wdev_data(padapter)->bandroid_scan = _FALSE;
@ -3448,6 +3452,9 @@ int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
static int netdev_close(struct net_device *pnetdev) static int netdev_close(struct net_device *pnetdev)
{ {
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
#ifdef CONFIG_IOCTL_CFG80211
struct wireless_dev *wdev = padapter->rtw_wdev;
#endif
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#ifdef CONFIG_BT_COEXIST_SOCKET_TRX #ifdef CONFIG_BT_COEXIST_SOCKET_TRX