New upstream version 5.3.9~20200710

Update upstream source from tag 'upstream/5.3.9_git20200710'
Update to upstream version '5.3.9~git20200710' with Debian dir 9d52024ab0
2020-07-10 09:08:57 +02:00 · 2020-07-10 08:55:17 +02:00 · 2020-07-10 08:55:07 +02:00 · 2020-05-14 11:45:59 +02:00 · 2020-05-14 11:44:23 +02:00 · 2020-05-14 11:44:14 +02:00
31 changed files with 354 additions and 77 deletions
@@ -0,0 +1,46 @@
+## Build Kernel Headers
+
+```
+cd [your kernel source directory]
+make module_prepare
+make modules_install INSTALL_MOD_PATH=../
+```
+
+## Build RTL8188EUS driver/modules
+
+```
+cd ../
+git clone https://github.com/aircrack-ng/rtl8188eus -b v5.3.9
+cd rtl8188eus
+```
+
+That command places this driver behind your kernel source directory (RECOMMENDED).
+If you put it anywhere you might need to set the Makefile in this driver, but i won't explain it.
+Now, do:
+
+```
+export ARCH=arm64
+export SUBARCH=arm64
+export CROSS_COMPILE=../toolchain/toolchain64/bin/aarch64-linux-android-
+export KBUILD_KVER=3.10.73-NetHunter-something
+```
+
+arm64 is the device architecture. 
+CROSS_COMPILE is your toolchain directory.
+KBUILD_KVER is your kernel build version, you can search for it in ../lib/modules (the place of your modules_install when you build kernel headers).
+
+Now, do:
+```
+make
+```
+
+If there is no error or success you will see a file named 8188eu.ko in this driver directory.
+
+
+## Load the driver (8188eu.ko)
+```
+su
+cd /system/lib/modules
+insmod 8188eu.ko
+```
+
@@ -1,6 +1,6 @@
-config RTL8188EUS
+config RTL8188EU
 	tristate "Realtek 8188E USB WiFi"
 	depends on USB
 	---help---
-	  Help message of RTL8188EUS
+	  Help message of RTL8188EU

@@ -1,30 +1,14 @@
 EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie
 EXTRA_CFLAGS += -O1
 #EXTRA_CFLAGS += -O3
-#EXTRA_CFLAGS += -Wall
-#EXTRA_CFLAGS += -Wextra
-#EXTRA_CFLAGS += -Werror
-#EXTRA_CFLAGS += -pedantic
-#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
-
 EXTRA_CFLAGS += -Wno-unused-variable
 EXTRA_CFLAGS += -Wno-unused-value
 EXTRA_CFLAGS += -Wno-unused-label
 EXTRA_CFLAGS += -Wno-unused-parameter
 EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-unused
-#EXTRA_CFLAGS += -Wno-uninitialized
 EXTRA_CFLAGS += -Wno-vla
-#EXTRA_CFLAGS += -Wno-cast-function-type
 EXTRA_CFLAGS += -Wno-date-time
-#EXTRA_CFLAGS += -Wno-misleading-indentation
-#EXTRA_CFLAGS += -Wno-uninitialized
-# Relax some warnings from '-Wextra' so we won't get flooded with warnings
-#EXTRA_CFLAGS += -Wno-sign-compare
-#EXTRA_CFLAGS += -Wno-missing-field-initializers
-#EXTRA_CFLAGS += -Wno-type-limits
-EXTRA_CFLAGS += -Wno-implicit-fallthrough
-EXTRA_CFLAGS += -Wno-maybe-uninitialized

 GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
 ifeq ($(GCC_VER_49),1)
@@ -56,7 +40,7 @@ CONFIG_PCI_HCI = n
 CONFIG_SDIO_HCI = n
 CONFIG_GSPI_HCI = n
 ########################## Features ###########################
-CONFIG_NET_NS = n
+CONFIG_NET_NS = y
 CONFIG_MP_INCLUDED = y
 CONFIG_POWER_SAVING = n
 CONFIG_USB_AUTOSUSPEND = n
@@ -89,10 +73,10 @@ CONFIG_RTW_IPCAM_APPLICATION = n
 CONFIG_RTW_REPEATER_SON = n
 CONFIG_RTW_WIFI_HAL = y
 ########################## Debug ###########################
-CONFIG_RTW_DEBUG = y
+CONFIG_RTW_DEBUG = n
 # default log level is _DRV_INFO_ = 4,
 # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
-CONFIG_RTW_LOG_LEVEL = 4
+CONFIG_RTW_LOG_LEVEL = 0
 ######################## Wake On Lan ##########################
 CONFIG_WOWLAN = n
 CONFIG_WAKEUP_TYPE = 0x7 #bit2: deauth, bit1: unicast, bit0: magic pkt.
@@ -170,6 +154,7 @@ CONFIG_PLATFORM_AML_S905 = n
 CONFIG_PLATFORM_ZTE_ZX296716 = n
 CONFIG_PLATFORM_ARM_ODROIDC2 = n
 CONFIG_PLATFORM_PPC = n
+CONFIG_PLATFORM_PPC64LE = n
 ###############################################################

 CONFIG_DRVEXT_MODULE = n
@@ -1047,8 +1032,7 @@ EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04
 ifeq ($(CONFIG_PLATFORM_I386_PC), y)
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
 EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
-SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/;")
-ARCH ?= $(SUBARCH)
+SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc64le/powerpc/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/;")ARCH ?= $(SUBARCH)
 CROSS_COMPILE ?=
 KVER  := $(shell uname -r)
 KSRC := /lib/modules/$(KVER)/build
@@ -1101,6 +1085,17 @@ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
 INSTALL_PREFIX :=
 endif

+ifeq ($(CONFIG_PLATFORM_PPC64LE), y)
+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+SUBARCH := $(shell uname -m | sed -e s/ppc64le/powerpc/)
+ARCH ?= $(SUBARCH)
+CROSS_COMPILE ?=
+KVER ?= $(shell uname -r)
+KSRC := /lib/modules/$(KVER)/build
+MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
+INSTALL_PREFIX :=
+endif
+
 ifeq ($(CONFIG_PLATFORM_NV_TK1), y)
 EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
@@ -5,18 +5,16 @@
 [![Monitor mode](https://img.shields.io/badge/monitor%20mode-supported-brightgreen.svg)](#)
 [![Frame Injection](https://img.shields.io/badge/frame%20injection-supported-brightgreen.svg)](#)
 [![MESH Mode](https://img.shields.io/badge/mesh%20mode-supported-brightgreen.svg)](#)
-[![GitHub issues](https://img.shields.io/github/issues/kimocoder/rtl8188eus.svg)](https://github.com/kimocoder/rtl8188eus/issues)
-[![GitHub forks](https://img.shields.io/github/forks/kimocoder/rtl8188eus.svg)](https://github.com/kimocoder/rtl8188eus/network)
-[![GitHub stars](https://img.shields.io/github/stars/kimocoder/rtl8188eus.svg)](https://github.com/kimocoder/rtl8188eus/stargazers)
-[![GitHub license](https://img.shields.io/github/license/kimocoder/rtl8812au.svg)](https://github.com/kimocoder/rtl8188eus/blob/master/LICENSE)<br>
+[![GitHub issues](https://img.shields.io/github/issues/aircrack-ng/rtl8188eus.svg)](https://github.com/aircrack-ng/rtl8188eus/issues)
+[![GitHub forks](https://img.shields.io/github/forks/aircrack-ng/rtl8188eus.svg)](https://github.com/aircrack-ng/rtl8188eus/network)
+[![GitHub stars](https://img.shields.io/github/stars/aircrack-ng/rtl8188eus.svg)](https://github.com/aircrack-ng/rtl8188eus/stargazers)
+[![GitHub license](https://img.shields.io/github/license/aircrack-ng/rtl8812au.svg)](https://github.com/aircrack-ng/rtl8188eus/blob/master/LICENSE)<br>
 [![Android](https://img.shields.io/badge/android%20(8)-supported-brightgreen.svg)](#)
 [![aircrack-ng](https://img.shields.io/badge/aircrack--ng-supported-blue.svg)](#)

-This is a pure Realtek release, not from vendor but from all the Realtek multichip "bases"
-we've seen, this must be the newest, most stable and effective one.
-The performance and code quality has been improved.

 # Supports
+* Android 7
 * MESH Support
 * Monitor mode
 * Frame injection
@@ -25,21 +23,21 @@ The performance and code quality has been improved.

 # Howto build/install
 1. You will need to blacklist another driver in order to use this one.
-2. "echo "blacklist r8188eu.ko" > "/etc/modprobe.d/realtek.conf"
+2. "echo "blacklist r8188eu" > "/etc/modprobe.d/realtek.conf"
 3. "make && make install"<br>
 4. Reboot in order to blacklist and load the new driver/module.

 # MONITOR MODE howto
 Use these steps to enter monitor mode.
 ```
-airmon-ng check-kill
-ip link set <interface> down
-iw dev <interface> set type monitor
+$ sudo airmon-ng check-kill
+$ sudo ip link set <interface> down
+$ sudo iw dev <interface> set type monitor
 ```
 Frame injection test may be performed with
 (after kernel v5.2 scanning is slow, run a scan or simply an airodump-ng first!)
 ```
-aireplay -9 <interface>
+$ aireplay -9 <interface>
 ```

 # NetworkManager configuration
@@ -62,12 +60,9 @@ plugins=keyfile
 unmanaged-devices=mac:A7:A7:A7:A7:A7
 ```

-# TODO
-* Implement txpower control
-
-* Finish up the elimination of the wrapper _rtw_memset.
-  I didn't have more time after "rtw_beamforming.c"
-
-* Add more VID/PIDS for all 3 chipsets supported.
-
-
+# Credits
+Realtek       - https://www.realtek.com<br>
+Alfa Networks - https://www.alfa.com.tw<br>
+aircrack-ng.  - https://www.aircrack-ng.org<br>
+<br>
+And all those who may be using or contributing to it of anykind. Thanks!<br>
@@ -6051,6 +6051,7 @@ ssize_t proc_set_lck(struct file *file, const char __user *buffer, size_t count,
 inline void RTW_BUF_DUMP_SEL(uint _loglevel, void *sel, u8 *_titlestring,
 					bool _idx_show, const u8 *_hexdata, int _hexdatalen)
 {
+#ifdef CONFIG_RTW_DEBUG
 	int __i;
 	u8 *ptr = (u8 *)_hexdata;

@@ -6076,6 +6077,7 @@ inline void RTW_BUF_DUMP_SEL(uint _loglevel, void *sel, u8 *_titlestring,
 		}
 		_RTW_PRINT_SEL(sel, "\n");
 	}
+#endif
 }
 #else
 inline void _RTW_STR_DUMP_SEL(void *sel, char *str_out)
@@ -1831,7 +1831,11 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
 			ptable->func = &OnAuth;
 		else
 			ptable->func = &OnAuthClient;
-	/* pass through */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+	__attribute__ ((fallthrough));
+#else
+			__attribute__ ((__fallthrough__));
+#endif
 	case WIFI_ASSOCREQ:
 	case WIFI_REASSOCREQ:
 		_mgt_dispatcher(padapter, ptable, precv_frame);
@@ -982,13 +982,6 @@ static void next_key(u8 *key, sint round);
 static void byte_sub(u8 *in, u8 *out);
 static void shift_row(u8 *in, u8 *out);
 static void mix_column(u8 *in, u8 *out);
-#ifndef PLATFORM_FREEBSD
-static void add_round_key(u8 *shiftrow_in,
-			  u8 *mcol_in,
-			  u8 *block_in,
-			  sint round,
-			  u8 *out);
-#endif /* PLATFORM_FREEBSD */
 static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext);


@@ -1929,7 +1922,6 @@ u32	rtw_aes_decrypt(_adapter *padapter, u8 *precvframe)


 	sint		length;
-	u32	prwskeylen;
 	u8	*pframe, *prwskey;	/* , *payload,*iv */
 	struct	sta_info		*stainfo;
 	struct	rx_pkt_attrib	*prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
@@ -2139,6 +2131,7 @@ BIP_exit:
 #endif /* CONFIG_IEEE80211W */

 #ifndef PLATFORM_FREEBSD
+#if defined(CONFIG_TDLS)
 /* compress 512-bits */
 static int sha256_compress(struct sha256_state *md, unsigned char *buf)
 {
@@ -2319,7 +2312,9 @@ static u8 os_strlen(const char *s)
 		p++;
 	return p - s;
 }
+#endif

+#if defined(CONFIG_TDLS) || defined(CONFIG_RTW_MESH_AEK)
 static int os_memcmp(const void *s1, const void *s2, u8 n)
 {
 	const unsigned char *p1 = s1, *p2 = s2;
@@ -2337,6 +2332,7 @@ static int os_memcmp(const void *s1, const void *s2, u8 n)

 	return *p1 - *p2;
 }
+#endif

 /**
 * hmac_sha256_vector - HMAC-SHA256 over data vector (RFC 2104)
@@ -2347,6 +2343,7 @@ static int os_memcmp(const void *s1, const void *s2, u8 n)
 * @len: Lengths of the data blocks
 * @mac: Buffer for the hash (32 bytes)
 */
+#if defined(CONFIG_TDLS)
 static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
 			       u8 *addr[], size_t *len, u8 *mac)
 {
@@ -2408,6 +2405,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
 	_len[1] = 32;
 	sha256_vector(2, _addr, _len, mac);
 }
+#endif /* CONFIG_TDLS */
 #endif /* PLATFORM_FREEBSD */
 /**
 * sha256_prf - SHA256-based Pseudo-Random Function (IEEE 802.11r, 8.5.1.5.2)
@@ -2423,6 +2421,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
 * given key.
 */
 #ifndef PLATFORM_FREEBSD /* Baron */
+#if defined(CONFIG_TDLS)
 static void sha256_prf(u8 *key, size_t key_len, char *label,
 		       u8 *data, size_t data_len, u8 *buf, size_t buf_len)
 {
@@ -2459,6 +2458,7 @@ static void sha256_prf(u8 *key, size_t key_len, char *label,
 		counter++;
 	}
 }
+#endif
 #endif /* PLATFORM_FREEBSD Baron */

 /* AES tables*/
@@ -3083,7 +3083,7 @@ int aes_siv_decrypt(const u8 *key, const u8 *iv_crypt, size_t iv_c_len,
 #endif /* CONFIG_RTW_MESH_AEK */

 #ifdef CONFIG_TDLS
-void wpa_tdls_generate_tpk(_adapter *padapter, PVOID sta)
+void wpa_tdls_generate_tpk(_adapter *padapter, void *sta)
 {
 	struct sta_info *psta = (struct sta_info *)sta;
 	struct mlme_priv	*pmlmepriv = &padapter->mlmepriv;
@@ -41,7 +41,7 @@ inline void rtw_st_ctl_init(struct st_ctl_t *st_ctl)
 	_rtw_init_queue(&st_ctl->tracker_q);
 }

-inline void rtw_st_ctl_clear_tracker_q(struct st_ctl_t *st_ctl)
+static inline void rtw_st_ctl_clear_tracker_q(struct st_ctl_t *st_ctl)
 {
 	_irqL irqL;
 	_list *plist, *phead;
@@ -1038,7 +1038,7 @@ exit:
 	return ret;
 }

-inline bool rtw_sec_camid_is_used(struct cam_ctl_t *cam_ctl, u8 id)
+static inline bool rtw_sec_camid_is_used(struct cam_ctl_t *cam_ctl, u8 id)
 {
 	_irqL irqL;
 	bool ret;
@@ -0,0 +1,5 @@
+realtek-rtl8188eus-dkms for Debian
+---------------------------------
+
+This package was automatically generated by the DKMS system,
+for distribution on Debian based operating systems.
@@ -0,0 +1,19 @@
+realtek-rtl8188eus-dkms (5.3.9~git20200710-0kali1) kali-dev; urgency=medium
+
+  * New upstream version 5.3.9~20200710
+
+ -- Sophie Brun <sophie@offensive-security.com>  Fri, 10 Jul 2020 08:49:51 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20200316-0kali1) kali-dev; urgency=medium
+
+  * Configure git-buildpackage for Kali
+  * Add GitLab's CI configuration file
+  * New upstream version 5.3.9~git20200316
+
+ -- Sophie Brun <sophie@offensive-security.com>  Thu, 14 May 2020 11:45:14 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~20191129-0kali1) kali-dev; urgency=medium
+
+  * Initial release (see 5842)
+
+ -- Sophie Brun <sophie@offensive-security.com>  Tue, 17 Dec 2019 17:14:38 +0100
@@ -0,0 +1,19 @@
+Source: realtek-rtl8188eus-dkms
+Section: contrib/kernel
+Priority: optional
+Maintainer: Kali Developers <devel@kali.org>
+Uploaders: Sophie Brun <sophie@offensive-security.com>
+Build-Depends: debhelper-compat (= 12), dkms, dh-exec
+Standards-Version: 4.4.1
+Homepage: https://github.com/aircrack-ng/rtl8188eus
+Vcs-Browser: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms
+Vcs-Git: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms.git
+
+Package: realtek-rtl8188eus-dkms
+Architecture: all
+Depends: dkms (>= 1.95), ${misc:Depends}
+Description: Realtek RTL8188EUS driver in DKMS format
+ This package provides the source code for RTL8188EUS Linux driver (with
+ monitor mode and frame injection) to be build with dkms. Kernel sources or
+ headers are required to compile this module.
+
@@ -0,0 +1,33 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: realtek-rtl8188eus-dkms
+Source: https://github.com/aircrack-ng/rtl8188eus
+
+Files: *
+Copyright: 2007 - 2017 Realtek Corporation.
+License: GPL-2
+
+Files: os_dep/linux/rhashtable.*
+Copyright: 2015 Herbert Xu <herbert@gondor.apana.org.au>
+           2014-2015 Thomas Graf <tgraf@suug.ch>
+	   2008-2014 Patrick McHardy <kaber@trash.net>
+License: GPL-2
+
+Files: debian/*
+Copyright: 2019 Sophie Brun <sophie@offensive-security.com>
+License: GPL-2
+
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 as published
+ by the Free Software Foundation.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
@@ -0,0 +1,10 @@
+[DEFAULT]
+debian-branch = kali/master
+debian-tag = kali/%(version)s
+pristine-tar = True
+
+[pq]
+patch-numbers = False
+
+[dch]
+multimaint-merge = True
@@ -0,0 +1,2 @@
+include:
+  - https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml
@@ -0,0 +1,19 @@
+From: Sophie Brun <sophie@offensive-security.com>
+Date: Fri, 10 Jul 2020 08:49:31 +0200
+Subject: Change dkms version
+
+---
+ dkms.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dkms.conf b/dkms.conf
+index 1c14127..85db2c2 100644
+--- a/dkms.conf
+++ b/dkms.conf
+@@ -1,5 +1,5 @@
+ PACKAGE_NAME="realtek-rtl8188eus"
+-PACKAGE_VERSION="5.3.9~20200316"
+PACKAGE_VERSION="5.3.9~20200710"
+ CLEAN="'make' clean"
+ BUILT_MODULE_NAME[0]=8188eu
+ PROCS_NUM=`nproc`
@@ -0,0 +1 @@
+Change-dkms-version.patch
@@ -0,0 +1 @@
+README.md
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+core hal include Kconfig Makefile os_dep platform usr/src/realtek-rtl8188eus-${DEB_VERSION_UPSTREAM}
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM
+
+%:
+	dh $@ --with dkms
+
+override_dh_dkms:
+	dh_dkms -V $(DEB_VERSION_UPSTREAM) -- dkms.conf
+
+override_dh_fixperms:
+	dh_fixperms
+	find debian/realtek-rtl8188eus-dkms/usr/src -type f -exec chmod -x {} \;
+
+# Nothing to configure, build or auto-install (all is done after
+# installation using dkms)
+override_dh_auto_configure:
+override_dh_auto_build:
+override_dh_auto_install:
@@ -0,0 +1 @@
+3.0 (quilt)
@@ -0,0 +1,4 @@
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%realtek-rtl8188eus-dkms-$1.tar.gz%" \
+   https://github.com/aircrack-ng/rtl8188eus/tags \
+   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-rtl8188eus"
-PACKAGE_VERSION="5.3.9~20191129"
+PACKAGE_VERSION="5.3.9~20200316"
 CLEAN="'make' clean"
 BUILT_MODULE_NAME[0]=8188eu
 PROCS_NUM=`nproc`
@@ -939,7 +939,7 @@ s32 c2h_handler(_adapter *adapter, u8 id, u8 seq, u8 plen, u8 *payload)
 #endif
 	case C2H_EXTEND:
 		sub_id = payload[0];
-		/* no handle, goto default */
+		__attribute__ ((__fallthrough__));

 	default:
 		if (phydm_c2H_content_parsing(adapter_to_phydm(adapter), id, plen, payload) != TRUE)
@@ -93,7 +93,7 @@

 	/*#define CONFIG_ANTENNA_DIVERSITY*/

-	#define CONFIG_CONCURRENT_MODE
+	//#define CONFIG_CONCURRENT_MODE
 	#ifdef CONFIG_CONCURRENT_MODE
 		#define CONFIG_RUNTIME_PORT_SWITCH
                #define CONFIG_SCAN_BACKOP
@@ -12,7 +12,7 @@
 * more details.
 *
 *****************************************************************************/
-#ifndef _RTL88812A_SRESET_H_
+#ifndef _RTL8812A_SRESET_H_
 #define _RTL8812A_SRESET_H_

 #include <rtw_sreset.h>
@@ -12,7 +12,7 @@
 * more details.
 *
 *****************************************************************************/
-#ifndef _RTL88812A_SRESET_H_
+#ifndef _RTL8812A_SRESET_H_
 #define _RTL8812A_SRESET_H_

 #include <rtw_sreset.h>
@@ -686,9 +686,13 @@ static int rtw_cfg80211_sync_iftype(_adapter *adapter)

 static u64 rtw_get_systime_us(void)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+	struct timespec64 ts;
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
 	struct timespec ts;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+	getboottime64(&ts);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0))
 	getboottime(&ts);
 #else
 	get_monotonic_boottime(&ts);
@@ -2367,6 +2371,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
 	case NL80211_IFTYPE_P2P_CLIENT:
 		is_p2p = _TRUE;
 	#endif
+	__attribute__ ((__fallthrough__));
 	case NL80211_IFTYPE_STATION:
 		networkType = Ndis802_11Infrastructure;

@@ -2391,6 +2396,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
 	case NL80211_IFTYPE_P2P_GO:
 		is_p2p = _TRUE;
 	#endif
+	__attribute__ ((__fallthrough__));
 	case NL80211_IFTYPE_AP:
 		networkType = Ndis802_11APMode;

@@ -817,7 +817,7 @@ void rtw_regsty_load_target_tx_power(struct registry_priv *regsty)
 #endif /* CONFIG_IEEE80211_BAND_5GHZ */
 }

-inline void rtw_regsty_load_excl_chs(struct registry_priv *regsty)
+static inline void rtw_regsty_load_excl_chs(struct registry_priv *regsty)
 {
 	int i;
 	int ch_num = 0;
@@ -831,7 +831,7 @@ inline void rtw_regsty_load_excl_chs(struct registry_priv *regsty)
 }

 #ifdef CONFIG_80211N_HT
-inline void rtw_regsty_init_rx_ampdu_sz_limit(struct registry_priv *regsty)
+static inline void rtw_regsty_init_rx_ampdu_sz_limit(struct registry_priv *regsty)
 {
 	int i, j;
 	uint *sz_limit;
@@ -1284,17 +1284,18 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
 	return dscp >> 5;
 }

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0))
-static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
-			    struct net_device *sb_dev)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
-static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
-			    struct net_device *sb_dev,
-			    select_queue_fallback_t fallback)
-#else
-static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
-			    void *accel_priv, select_queue_fallback_t fallback)
+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)
+	  , void *accel_priv
+  #else
+    , struct net_device *sb_dev
+  #endif
+  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0))
+	  , select_queue_fallback_t fallback
+  #endif
 #endif
+)
 {
 	_adapter	*padapter = rtw_netdev_priv(dev);
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -62,7 +62,12 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_
 }

 inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
-	const struct file_operations *fops, void * data)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+const struct proc_ops *fops, void * data)
+#else
+const struct file_operations *fops, void * data)
+#endif
+
 {
 	struct proc_dir_entry *entry;

@@ -230,6 +235,26 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer,
 	return -EROFS;
 }

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct proc_ops rtw_drv_proc_seq_fops = {
+	//.proc_owner = THIS_MODULE,
+        .proc_open = rtw_drv_proc_open,
+        .proc_read = seq_read,
+        .proc_lseek = seq_lseek,
+        .proc_release = seq_release,
+	.proc_write = rtw_drv_proc_write,
+};
+
+static const struct proc_ops rtw_drv_proc_sseq_fops = {
+	//.proc_owner = THIS_MODULE,
+	.proc_open = rtw_drv_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_drv_proc_write,
+};
+
+#else
 static const struct file_operations rtw_drv_proc_seq_fops = {
 	.owner = THIS_MODULE,
 	.open = rtw_drv_proc_open,
@@ -247,6 +272,7 @@ static const struct file_operations rtw_drv_proc_sseq_fops = {
 	.release = single_release,
 	.write = rtw_drv_proc_write,
 };
+#endif

 int rtw_drv_proc_init(void)
 {
@@ -3683,6 +3709,27 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff
 	return -EROFS;
 }

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct  proc_ops  rtw_adapter_proc_seq_fops = {
+	//.proc_owner = THIS_MODULE,
+	.proc_open = rtw_adapter_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = seq_release,
+	.proc_write = rtw_adapter_proc_write,
+};
+
+static const struct  proc_ops  rtw_adapter_proc_sseq_fops = {
+	//.proc_owner = THIS_MODULE,
+	.proc_open = rtw_adapter_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_adapter_proc_write,
+};
+
+#else
+
 static const struct file_operations rtw_adapter_proc_seq_fops = {
 	.owner = THIS_MODULE,
 	.open = rtw_adapter_proc_open,
@@ -3700,6 +3747,7 @@ static const struct file_operations rtw_adapter_proc_sseq_fops = {
 	.release = single_release,
 	.write = rtw_adapter_proc_write,
 };
+#endif

 int proc_get_odm_adaptivity(struct seq_file *m, void *v)
 {
@@ -3855,6 +3903,26 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer,
 	return -EROFS;
 }

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct  proc_ops  rtw_odm_proc_seq_fops = {
+	//.proc_owner = THIS_MODULE,
+	.proc_open = rtw_odm_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = seq_release,
+	.proc_write = rtw_odm_proc_write,
+};
+
+static const struct  proc_ops  rtw_odm_proc_sseq_fops = {
+	//.proc_owner = THIS_MODULE,
+	.proc_open = rtw_odm_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_odm_proc_write,
+};
+
+#else
 static const struct file_operations rtw_odm_proc_seq_fops = {
 	.owner = THIS_MODULE,
 	.open = rtw_odm_proc_open,
@@ -3873,6 +3941,8 @@ static const struct file_operations rtw_odm_proc_sseq_fops = {
 	.write = rtw_odm_proc_write,
 };

+#endif
+
 struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
 {
 	struct proc_dir_entry *dir_odm = NULL;
@@ -3996,6 +4066,26 @@ static ssize_t rtw_mcc_proc_write(struct file *file, const char __user *buffer,
 	return -EROFS;
 }

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
+static const struct  proc_ops  rtw_mcc_proc_seq_fops = {
+	.proc_owner = THIS_MODULE,
+	.proc_open = rtw_mcc_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = seq_release,
+	.proc_write = rtw_mcc_proc_write,
+};
+
+static const struct  proc_ops  rtw_mcc_proc_sseq_fops = {
+	.proc_owner = THIS_MODULE,
+	.proc_open = rtw_mcc_proc_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rtw_mcc_proc_write,
+};
+
+#else
 static const struct file_operations rtw_mcc_proc_seq_fops = {
 	.owner = THIS_MODULE,
 	.open = rtw_mcc_proc_open,
@@ -4013,6 +4103,7 @@ static const struct file_operations rtw_mcc_proc_sseq_fops = {
 	.release = single_release,
 	.write = rtw_mcc_proc_write,
 };
+#endif

 struct proc_dir_entry *rtw_mcc_proc_init(struct net_device *dev)
 {
@@ -286,7 +286,7 @@ inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb)
 	return skb_clone(skb);
 #endif /* PLATFORM_FREEBSD */
 }
-inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb)
+static inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb)
 {
 #ifdef PLATFORM_LINUX
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36))
Author	SHA1	Message	Date
Sophie Brun	627a0f8e2c	New upstream version 5.3.9~20200710	2020-07-10 09:08:57 +02:00
Sophie Brun	4bd5e85b7b	Update upstream source from tag 'upstream/5.3.9_git20200710' Update to upstream version '5.3.9~git20200710' with Debian dir `9d52024ab0`	2020-07-10 08:55:17 +02:00
Sophie Brun	1791b22180	New upstream version 5.3.9~git20200710	2020-07-10 08:55:07 +02:00
Sophie Brun	ce21fa5d6b	New upstream version 5.3.9~git20200316	2020-05-14 11:45:59 +02:00
Sophie Brun	a313c3997a	Update upstream source from tag 'upstream/5.3.9_git20200316' Update to upstream version '5.3.9~git20200316' with Debian dir `c5dba9c629`	2020-05-14 11:44:23 +02:00
Sophie Brun	be8eedcf76	New upstream version 5.3.9~git20200316	2020-05-14 11:44:14 +02:00
Sophie Brun	3b2b01c647	Add GitLab's CI configuration file	2019-12-17 17:39:03 +01:00
Sophie Brun	9c36ca92c2	Configure git-buildpackage for Kali	2019-12-17 17:39:03 +01:00
Sophie Brun	ea83a483fa	Initial release	2019-12-17 17:34:14 +01:00