New upstream version 5.3.9~git20230921.3fae723

README.md

@@ -18,28 +18,37 @@
 * MESH Support
 * Monitor mode
 * Frame injection
-* Up to kernel v6.0+
+* Up to kernel v6.5+
 ... And a bunch of various wifi chipsets
 
 # Howto build/install
-1. You will need to blacklist another driver in order to use this one.
-2. `echo 'blacklist r8188eu'|sudo tee -a '/etc/modprobe.d/realtek.conf'`
-3. Reboot
-4. cd rtl8188eus
-5. `make && sudo make install`
-6. Reboot in order to blacklist and load the new driver/module.
+1. Compile and install the driver:
+```
+cd rtl8188eus
+make && sudo make install
+```
+2. Blacklist another drivers in order to use this one:
+```
+echo 'blacklist r8188eu' | sudo tee -a '/etc/modprobe.d/realtek.conf'
+echo 'blacklist rtl8xxxu' | sudo tee -a '/etc/modprobe.d/realtek.conf'
+```
+3. `reboot` or remove all drivers related to RTL8188 and reload this one:
+```
+rmmod r8188eu rtl8xxxu 8188eu
+modprobe 8188eu
+```
 
 # MONITOR MODE howto
 Use these steps to enter monitor mode.
 ```
-$ sudo airmon-ng check kill
-$ sudo ip link set <interface> down
-$ sudo 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>
+sudo aireplay-ng -9 <interface>
 ```
 
 # NetworkManager configuration

core/rtw_br_ext.c

@@ -117,7 +117,13 @@ static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_ta
 	/* have a room for new tag */
 	memmove(((unsigned char *)ph->tag + data_len), (unsigned char *)ph->tag, ntohs(ph->length));
 	ph->length = htons(ntohs(ph->length) + data_len);
+#if (defined __GNUC__) && (__GNUC__ > 10)
+    #pragma GCC diagnostic ignored "-Wstringop-overread"
+#endif
 	memcpy((unsigned char *)ph->tag, tag, data_len);
+#if (defined __GNUC__) && (__GNUC__ > 10)
+    #pragma GCC diagnostic pop
+#endif
 	return data_len;
 }
 

core/rtw_mp.c

@@ -14,9 +14,6 @@
  *****************************************************************************/
 #define _RTW_MP_C_
 #include <drv_types.h>
-#ifdef PLATFORM_FREEBSD
-	#include <sys/unistd.h>		/* for RFHIGHPID */
-#endif
 
 #include "../hal/phydm/phydm_precomp.h"
 #if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8821A)
@@ -163,64 +160,6 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv)
 
 }
 
-#ifdef PLATFORM_WINDOWS
-#if 0
-void mp_wi_callback(
-	IN NDIS_WORK_ITEM	*pwk_item,
-	IN PVOID			cntx
-)
-{
-	_adapter *padapter = (_adapter *)cntx;
-	struct mp_priv *pmppriv = &padapter->mppriv;
-	struct mp_wi_cntx	*pmp_wi_cntx = &pmppriv->wi_cntx;
-
-	/*  Execute specified action. */
-	if (pmp_wi_cntx->curractfunc != NULL) {
-		LARGE_INTEGER	cur_time;
-		ULONGLONG start_time, end_time;
-		NdisGetCurrentSystemTime(&cur_time);	/*  driver version */
-		start_time = cur_time.QuadPart / 10; /*  The return value is in microsecond */
-
-		pmp_wi_cntx->curractfunc(padapter);
-
-		NdisGetCurrentSystemTime(&cur_time);	/*  driver version */
-		end_time = cur_time.QuadPart / 10; /*  The return value is in microsecond */
-
-	}
-
-	NdisAcquireSpinLock(&(pmp_wi_cntx->mp_wi_lock));
-	pmp_wi_cntx->bmp_wi_progress = _FALSE;
-	NdisReleaseSpinLock(&(pmp_wi_cntx->mp_wi_lock));
-
-	if (pmp_wi_cntx->bmpdrv_unload)
-		NdisSetEvent(&(pmp_wi_cntx->mp_wi_evt));
-
-}
-#endif
-
-static int init_mp_priv_by_os(struct mp_priv *pmp_priv)
-{
-	struct mp_wi_cntx *pmp_wi_cntx;
-
-	if (pmp_priv == NULL)
-		return _FAIL;
-
-	pmp_priv->rx_testcnt = 0;
-	pmp_priv->rx_testcnt1 = 0;
-	pmp_priv->rx_testcnt2 = 0;
-
-	pmp_priv->tx_testcnt = 0;
-	pmp_priv->tx_testcnt1 = 0;
-
-	pmp_wi_cntx = &pmp_priv->wi_cntx
-		      pmp_wi_cntx->bmpdrv_unload = _FALSE;
-	pmp_wi_cntx->bmp_wi_progress = _FALSE;
-	pmp_wi_cntx->curractfunc = NULL;
-
-	return _SUCCESS;
-}
-#endif
-
 #ifdef PLATFORM_LINUX
 static int init_mp_priv_by_os(struct mp_priv *pmp_priv)
 {
@@ -1940,17 +1879,6 @@ void SetPacketTx(PADAPTER padapter)
 		pmp_priv->tx.PktTxThread = NULL;
 	}
 #endif
-#ifdef PLATFORM_FREEBSD
-	{
-		struct proc *p;
-		struct thread *td;
-		pmp_priv->tx.PktTxThread = kproc_kthread_add(mp_xmit_packet_thread, pmp_priv,
-			&p, &td, RFHIGHPID, 0, "MPXmitThread", "MPXmitThread");
-
-		if (pmp_priv->tx.PktTxThread < 0)
-			RTW_INFO("Create PktTx Thread Fail !!!!!\n");
-	}
-#endif
 
 	Rtw_MPSetMacTxEDCA(padapter);
 exit:

debian/README.Debian

@@ -1,4 +0,0 @@
-realtek-rtl8188eus DKMS module for Debian
-
-This package was automatically generated by the DKMS system,
-for distribution on Debian based operating systems.

debian/changelog

@@ -1,139 +0,0 @@
-realtek-rtl8188eus-dkms (5.3.9~git20230101.f8ead57-0kali1) kali-dev; urgency=medium
-
-  [ Kali Janitor ]
-  * Set upstream metadata fields: Repository.
-  * Update standards version to 4.6.2, no changes needed.
-
-  [ Sophie Brun ]
-  * New upstream version 5.3.9~git20230101.f8ead57
-  * Refresh patches
-  * Add support for Linux Kernel 6.1
-
- -- Sophie Brun <sophie@offensive-security.com>  Tue, 21 Feb 2023 14:51:34 +0100
-
-realtek-rtl8188eus-dkms (5.3.9~git20221105.dab6e02-0kali1) kali-dev; urgency=medium
-
-  [ Kali Janitor ]
-  * Set upstream metadata fields: Repository-Browse.
-
-  [ Sophie Brun ]
-  * New upstream version 5.3.9~git20221105.dab6e02
-  * Refresh patches
-
- -- Sophie Brun <sophie@offensive-security.com>  Thu, 10 Nov 2022 12:01:30 +0100
-
-realtek-rtl8188eus-dkms (5.3.9~git20220829.4ba8e08-0kali1) kali-dev; urgency=medium
-
-  [ Arnaud Rebillout ]
-  * No more dh-exec (requires compat 13)
-  * Switch to dh-sequence-dkms
-  * Set PACKAGE_VERSION in override_dh_dkms
-
-  [ Kali Janitor ]
-  * Trim trailing whitespace.
-  * debian/copyright: use spaces rather than tabs to start continuation lines.
-  * Set upstream metadata fields: Bug-Database, Bug-Submit.
-  * Update standards version to 4.6.1, no changes needed.
-
-  [ Sophie Brun ]
-  * New upstream version 5.3.9~git20220829.4ba8e08
-  * Refresh patches
-  * Import upstream patch to fix the build with Linux 5.19
-
- -- Sophie Brun <sophie@offensive-security.com>  Thu, 06 Oct 2022 15:05:27 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali3) kali-dev; urgency=medium
-
-  * Remove useless patch (we change version in debian/rules)
-  * Refresh patch
-  * Add a patch to fix the build with kernel 5.18
-
- -- Sophie Brun <sophie@offensive-security.com>  Tue, 21 Jun 2022 12:20:45 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali2) kali-dev; urgency=medium
-
-  * Add a patch to fix build build with kernel 5.17
-
- -- Sophie Brun <sophie@offensive-security.com>  Wed, 18 May 2022 17:50:10 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali1) kali-dev; urgency=medium
-
-  * New upstream version 5.3.9~git20220319.0958f29
-  * Refresh patches
-
- -- Sophie Brun <sophie@offensive-security.com>  Thu, 12 May 2022 11:02:51 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali2) kali-dev; urgency=medium
-
-  [ Ben Wilson ]
-  * Remove template comment and switch spaces to tabs
-
-  [ Sophie Brun ]
-  * Add a patch to fix the compilation with kernel 5.15
-
- -- Sophie Brun <sophie@offensive-security.com>  Tue, 14 Dec 2021 17:56:08 +0100
-
-realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali1) kali-dev; urgency=medium
-
-  * New upstream version 5.3.9~git20210504.6146193
-  * Refresh patches
-
- -- Sophie Brun <sophie@offensive-security.com>  Tue, 28 Sep 2021 11:00:05 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20210206.1e7145f-0kali2) kali-dev; urgency=medium
-
-  * Bump Standards-Version to 4.5.1
-  * Blacklist r8188eu
-
- -- Sophie Brun <sophie@offensive-security.com>  Tue, 13 Jul 2021 10:50:42 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20210206.1e7145f-0kali1) kali-dev; urgency=medium
-
-  * Update debian/watch
-  * New upstream version 5.3.9~git20210206.1e7145f
-  * Refresh patches
-
- -- Sophie Brun <sophie@offensive-security.com>  Wed, 14 Apr 2021 17:25:11 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20201227-0kali1) kali-dev; urgency=medium
-
-  * New upstream version 5.3.9~git20201227
-  * Refresh patches
-
- -- Sophie Brun <sophie@offensive-security.com>  Tue, 26 Jan 2021 17:04:18 +0100
-
-realtek-rtl8188eus-dkms (5.3.9~git20200829-0kali2) kali-dev; urgency=medium
-
-  * Fix errors introduced in 5a7f22 (lintian-overrides)
-
- -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Sep 2020 15:54:13 +0200
-
-realtek-rtl8188eus-dkms (5.3.9~git20200829-0kali1) kali-dev; urgency=medium
-
-  * New upstream version 5.3.9~git20200829
-  * Refresh patches
-  * Add comment in debian/copyright
-  * Bump Standards-Version to 4.5.0
-  * Add lintian-overrides for dh-exec-subst-unknown-variable
-
- -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Sep 2020 15:07:29 +0200
-
-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

debian/control

@@ -1,18 +0,0 @@
-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 (= 13), dh-sequence-dkms
-Standards-Version: 4.6.2
-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.

debian/copyright

@@ -1,34 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: realtek-rtl8188eus-dkms
-Source: https://github.com/aircrack-ng/rtl8188eus
-Comment: dkms package built during installation
-
-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".

debian/gbp.conf

@@ -1,10 +0,0 @@
-[DEFAULT]
-debian-branch = kali/master
-debian-tag = kali/%(version)s
-pristine-tar = True
-
-[pq]
-patch-numbers = False
-
-[dch]
-multimaint-merge = True

debian/kali-ci.yml

@@ -1,2 +0,0 @@
-include:
-  - https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml

debian/patches/add-linux-6.1-support.patch

@@ -1,113 +0,0 @@
-From: Sophie Brun <sophie@offensive-security.com>
-Date: Tue, 21 Feb 2023 14:49:29 +0100
-Subject: Add Linux 6.1 build support
-
-Origin: https://github.com/aircrack-ng/rtl8188eus/pull/226
-Forwarded: not-needed
----
- dkms.conf                     |  1 -
- os_dep/linux/ioctl_cfg80211.c | 21 +++++++++++++++++++--
- os_dep/linux/os_intfs.c       |  4 ++++
- os_dep/osdep_service.c        |  4 +++-
- 4 files changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/dkms.conf b/dkms.conf
-index 2c60a99..d1d1dc8 100644
---- a/dkms.conf
-+++ b/dkms.conf
-@@ -7,4 +7,3 @@ PROCS_NUM=`nproc`
- DEST_MODULE_LOCATION[0]="/updates"
- MAKE="'make' -j$PROCS_NUM KVER=${kernelver} KSRC=/lib/modules/${kernelver}/build"
- AUTOINSTALL="yes"
--REMAKE_INITRD=no
-diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
-index b68e5eb..b799e58 100644
---- a/os_dep/linux/ioctl_cfg80211.c
-+++ b/os_dep/linux/ioctl_cfg80211.c
-@@ -1660,6 +1660,9 @@ exit:
- }
- 
- static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+	, int link_id
-+#endif
- 	, u8 key_index
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	, bool pairwise
-@@ -1804,6 +1807,9 @@ addkey_end:
- }
- 
- static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+	, int link_id
-+#endif
- 	, u8 keyid
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	, bool pairwise
-@@ -1969,6 +1975,9 @@ exit:
- }
- 
- static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+	int link_id,
-+#endif
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 				u8 key_index, bool pairwise, const u8 *mac_addr)
- #else	/* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */
-@@ -1989,7 +1998,11 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
- }
- 
- static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
--	struct net_device *ndev, u8 key_index
-+	struct net_device *ndev,
-+	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+	int link_id,
-+	#endif
-+	u8 key_index
- 	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE)
- 	, bool unicast, bool multicast
- 	#endif
-@@ -2037,7 +2050,11 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
- int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
--	struct net_device *ndev, u8 key_index)
-+	struct net_device *ndev,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+	int link_id,
-+#endif
-+	u8 key_index)
- {
- #define SET_DEF_KEY_PARAM_FMT " key_index=%d"
- #define SET_DEF_KEY_PARAM_ARG , key_index
-diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
-index f006fc8..1d28862 100644
---- a/os_dep/linux/os_intfs.c
-+++ b/os_dep/linux/os_intfs.c
-@@ -1618,7 +1618,11 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
- 	u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);
- 
- #ifdef CONFIG_RTW_NAPI
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+	netif_napi_add_weight(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
-+#else
- 	netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
-+#endif
- #endif /* CONFIG_RTW_NAPI */
- 
- #if defined(CONFIG_IOCTL_CFG80211)
-diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
-index 7367bca..5480971 100644
---- a/os_dep/osdep_service.c
-+++ b/os_dep/osdep_service.c
-@@ -2574,7 +2574,9 @@ u64 rtw_division64(u64 x, u64 y)
- inline u32 rtw_random32(void)
- {
- #ifdef PLATFORM_LINUX
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+	return get_random_u32();
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
- 	return prandom_u32();
- #elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
- 	u32 random_int;

debian/patches/add-support-kernel-5.17.patch

@@ -1,25 +0,0 @@
-From: Sophie Brun <sophie@offensive-security.com>
-Date: Wed, 18 May 2022 17:47:55 +0200
-Subject: Build support with kernel v5.17
-
-Origin: https://github.com/aircrack-ng/rtl8188eus/commit/13cc38399eb44f234a52dde5f94509e54a09c71f
-Forwarded: not-needed
----
- os_dep/linux/rtw_proc.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c
-index 8b1a424..9bd4041 100644
---- a/os_dep/linux/rtw_proc.c
-+++ b/os_dep/linux/rtw_proc.c
-@@ -39,6 +39,10 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void)
- #define proc_get_parent_data(inode) PDE((inode))->parent->data
- #endif
- 
-+#if(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
-+#define PDE_DATA(inode) pde_data(inode)
-+#endif
-+
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
- #define get_proc_net proc_net
- #else

debian/patches/series

@@ -1,2 +0,0 @@
-add-support-kernel-5.17.patch
-add-linux-6.1-support.patch

debian/r8188eus-dkms.conf

@@ -1,2 +0,0 @@
-# blacklist the driver
-blacklist r8188eu

debian/realtek-rtl8188eus-dkms.docs

@@ -1 +0,0 @@
-README.md

debian/realtek-rtl8188eus-dkms.install

@@ -1,2 +0,0 @@
-core hal include Kconfig Makefile os_dep platform usr/src/realtek-rtl8188eus-${env:DEB_VERSION_UPSTREAM}
-debian/r8188eus-dkms.conf etc/modprobe.d

debian/rules

@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/dpkg/pkg-info.mk
-export DEB_VERSION_UPSTREAM
-
-%:
-	dh $@
-
-override_dh_dkms:
-	# Force PACKAGE_VERSION to be DEB_VERSION_UPSTREAM
-	sed -i dkms.conf -e 's%^PACKAGE_VERSION=.*%PACKAGE_VERSION="$(DEB_VERSION_UPSTREAM)"%'
-	dh_dkms -- dkms.conf
-
-execute_after_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:

debian/script-targz

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "$1" = '--upstream-version' ]; then
-    new_version="$2"
-else
-    printf "Missing --upstream-version argument" 1>&2
-    exit 1
-fi
-
-DEB_SOURCE="$(dpkg-parsechangelog -SSource)"
-
-default_branch="$(git remote show https://github.com/aircrack-ng/rtl8188eus.git | grep 'HEAD' | sed 's/.*: v//')"
-
-version="$(echo ${new_version} | sed 's/~git.*//')"
-
-# fails if the upstream default branch has changed and is no longer the
-# version mentioned in debian/watch
-if [ "${default_branch}" != "${version}" ]; then
-    exit 1
-fi

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/upstream/metadata

@@ -1,5 +0,0 @@
----
-Bug-Database: https://github.com/aircrack-ng/rtl8188eus/issues
-Bug-Submit: https://github.com/aircrack-ng/rtl8188eus/issues/new
-Repository: https://github.com/aircrack-ng/rtl8188eus.git
-Repository-Browse: https://github.com/aircrack-ng/rtl8188eus

debian/watch

@@ -1,9 +0,0 @@
-version=4
-opts="mode=git, pretty=5.3.9~git%cd.%h, pgpmode=none" \
-  https://github.com/aircrack-ng/rtl8188eus.git \
-  HEAD debian debian/script-targz
-
-# Use the following when upstream starts to tag releases:
-#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

hal/phydm/halrf/halrf.h

@@ -354,7 +354,7 @@ halrf_cmn_info_init(
 void
 halrf_cmn_info_hook(
 	void		*dm_void,
-	u32		cmn_info,
+	enum halrf_cmninfo_hook cmn_info,
 	void		*value
 );
 

os_dep/linux/ioctl_cfg80211.c

@@ -417,7 +417,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
 	if (ret != _SUCCESS)
 		goto exit;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
+        cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
 #else
 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
@@ -1104,6 +1106,7 @@ check_bss:
 
 		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL79))
 		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
+                roam_info.links[0].channel = notify_channel;
 		roam_info.links[0].bssid = cur_network->network.MacAddress;
 		#else
 		roam_info.bssid = cur_network->network.MacAddress;
@@ -1138,13 +1141,17 @@ check_bss:
 		RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
 		#endif
 
-		if (check_fwstate(pmlmepriv, WIFI_MONITOR_STATE) != _TRUE)
-			rtw_cfg80211_connect_result(pwdev, cur_network->network.MacAddress
-				, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
-				, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
-				, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
-				, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
-				, WLAN_STATUS_SUCCESS, GFP_ATOMIC);
+		if (check_fwstate(pmlmepriv, WIFI_MONITOR_STATE) != _TRUE) {
+                        struct cfg80211_bss *bss;
+                        bss = cfg80211_get_bss(pwdev->wiphy, NULL, cur_network->network.MacAddress, NULL, 0, 
+                                IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
+                        cfg80211_connect_bss(wdev_to_ndev(pwdev), cur_network->network.MacAddress, bss
+                                , pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
+                                , pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
+                                , pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
+                                , pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
+                                , WLAN_STATUS_SUCCESS, GFP_ATOMIC, NL80211_TIMEOUT_UNSPECIFIED);
+                }
 		#if defined(RHEL79) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE))
 		RTW_INFO("pwdev->sme_state(a)=%d\n", pwdev->sme_state);
 		#endif
@@ -1660,6 +1667,9 @@ exit:
 }
 
 static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+        , int link_id
+#endif
 	, u8 key_index
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
 	, bool pairwise
@@ -1804,6 +1814,9 @@ addkey_end:
 }
 
 static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+        , int link_id
+#endif
 	, u8 keyid
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
 	, bool pairwise
@@ -1969,6 +1982,9 @@ exit:
 }
 
 static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+        int link_id,
+#endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
 				u8 key_index, bool pairwise, const u8 *mac_addr)
 #else	/* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */
@@ -1989,7 +2005,11 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
 }
 
 static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
-	struct net_device *ndev, u8 key_index
+	struct net_device *ndev,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+        int link_id,
+#endif
+        u8 key_index
 	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE)
 	, bool unicast, bool multicast
 	#endif
@@ -2037,7 +2057,11 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
 int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
-	struct net_device *ndev, u8 key_index)
+	struct net_device *ndev,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+        int link_id,
+#endif
+        u8 key_index)
 {
 #define SET_DEF_KEY_PARAM_FMT " key_index=%d"
 #define SET_DEF_KEY_PARAM_ARG , key_index

os_dep/linux/ioctl_linux.c

@@ -9789,7 +9789,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
 		rtw_hal_read_chip_info(padapter);
 		/* set mac addr*/
 		rtw_macaddr_cfg(adapter_mac_addr(padapter), get_hal_mac_addr(padapter));
-		_rtw_memcpy(padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */
+		_rtw_memcpy((void *)padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */
 
 #ifdef CONFIG_P2P
 		rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));

os_dep/linux/os_intfs.c

@@ -1618,7 +1618,11 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
 	u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);
 
 #ifdef CONFIG_RTW_NAPI
-	netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+        netif_napi_add_weight(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
+#else
+        netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
+#endif
 #endif /* CONFIG_RTW_NAPI */
 
 #if defined(CONFIG_IOCTL_CFG80211)

os_dep/osdep_service.c

@@ -2451,7 +2451,7 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname)
 
 	rtw_init_netdev_name(pnetdev, ifname);
 
-	_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
+	_rtw_memcpy((void *)pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
 
 	if (rtnl_lock_needed)
 		ret = register_netdev(pnetdev);
@@ -2574,7 +2574,9 @@ u64 rtw_division64(u64 x, u64 y)
 inline u32 rtw_random32(void)
 {
 #ifdef PLATFORM_LINUX
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+        return get_random_u32();
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
 	return prandom_u32();
 #elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
 	u32 random_int;