README.md

@@ -18,37 +18,28 @@
 * MESH Support
 * Monitor mode
 * Frame injection
-* Up to kernel v6.5+
+* Up to kernel v6.0+
 ... And a bunch of various wifi chipsets
 
 # Howto build/install
-1. Compile and install the driver:
+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'`
-cd rtl8188eus
+3. Reboot
-make && sudo make install
+4. cd rtl8188eus
-```
+5. `make && sudo make install`
-2. Blacklist another drivers in order to use this one:
+6. Reboot in order to blacklist and load the new driver/module.
-```
-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 airmon-ng check kill
-sudo ip link set <interface> down
+$ sudo ip link set <interface> down
-sudo iw dev <interface> set type monitor
+$ 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!)
 ```
-sudo aireplay-ng -9 <interface>
+$ aireplay -9 <interface>
 ```
 
 # NetworkManager configuration

core/rtw_br_ext.c

@@ -117,13 +117,7 @@ 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,6 +14,9 @@
  *****************************************************************************/
 #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)
@@ -160,6 +163,64 @@ 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)
 {
@@ -1879,6 +1940,17 @@ 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/changelog

@@ -1,20 +1,3 @@
-realtek-rtl8188eus-dkms (5.3.9~git20230921.3fae723-0kali1) kali-dev; urgency=medium
-
-  * New upstream version 5.3.9~git20230921.3fae723
-  * Refresh patches
-
- -- Sophie Brun <sophie@offensive-security.com>  Mon, 15 Jan 2024 14:53:09 +0100
-
-realtek-rtl8188eus-dkms (5.3.9~git20230101.f8ead57-0kali2) kali-dev; urgency=medium
-
-  [ Steev Klimaszewski ]
-  * Override dkms autopkgtest
-
-  [ Sophie Brun ]
-  * Import a patch to build for 6.3
-
- -- Sophie Brun <sophie@offensive-security.com>  Wed, 05 Jul 2023 14:32:27 +0200
-
 realtek-rtl8188eus-dkms (5.3.9~git20230101.f8ead57-0kali1) kali-dev; urgency=medium
 
   [ Kali Janitor ]

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

@@ -5,8 +5,11 @@ Subject: Add Linux 6.1 build support
 Origin: https://github.com/aircrack-ng/rtl8188eus/pull/226
 Forwarded: not-needed
 ---
- dkms.conf | 1 -
+ dkms.conf                     |  1 -
- 1 file changed, 1 deletion(-)
+ 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
@@ -17,3 +20,94 @@ index 2c60a99..d1d1dc8 100644
  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/tests/control

@@ -1,2 +0,0 @@
-Test-Command: debian/tests/dkms-autopkgtest
-Restrictions: needs-root allow-stderr

debian/tests/dkms-autopkgtest

@@ -1,229 +0,0 @@
-#!/bin/sh
-# Common autopkgtest script for testing a dkms source package.
-# Author: Martin Pitt <martin.pitt@ubuntu.com>
-# Copyright: (C) 2014 Canonical Ltd.
-set -eu
-
-export DEBIAN_FRONTEND=noninteractive
-
-result=0
-summary=
-crlf="
-"
-
-header_packages=
-check_for_linux_headers() {
-    # Act only on the first run.
-    if [ -n "$header_packages" ]; then
-        return
-    fi
-
-    # Which Linux header packages are installed?
-    header_packages=$(dpkg-query -f '${Status} ${Package}\n' -W 'linux-headers-*' 2>/dev/null | sed -r -n 's/^install ok installed //p')
-    if [ -n "$header_packages" ]; then
-        echo "I: Using the following Linux header packages that were already installed:"
-        for p in $header_packages ; do
-            echo "I:   $p"
-        done
-        return
-    fi
-
-    # Which Linux header packages could be installed?
-    # linux-doc is a dependency generated by autodep8 for autopkgtest-pkg-dkms
-    # install only linux-headers-* matching the source version of linux-doc
-    wanted_source_version=$(dpkg-query -f '${source:Version}' -W linux-doc 2>/dev/null || true)
-    candidates=$(apt-cache search --names-only '^linux-headers-' | awk '{print $1}' | grep -v -E -e '-common(-rt)?$' | grep -v cloud)
-    echo "I: No Linux header packages are installed."
-    echo "I: Installing all available ones from src:linux $wanted_source_version:"
-    for p in $candidates ; do
-        if [ -z "$wanted_source_version" ]; then
-            echo "I:   $p"
-            header_packages="$header_packages $p"
-            continue
-        fi
-        source_versions=$(apt-cache show $p | perl -ne 'if (/^$/) { print $s || $v, "\n"; $s=$v=""; } $s=$1 if /^Source: .* \((.*)\)$/; $v=$1 if /^Version: (.*)$/;')
-        for sv in $source_versions ; do
-            if [ "$sv" = "$wanted_source_version" ]; then
-                echo "I:   install $p"
-                header_packages="$header_packages $p"
-                continue 2
-            fi
-        done
-        echo "I:   skip    $p"
-    done
-    RC=0
-    apt-get install --no-install-recommends -yq $header_packages </dev/null 2>&1 || RC=$?
-    if [ "$RC" -ne 0 ]; then
-        echo "E: Linux headers failed to install." >&2
-        exit 1
-    fi
-}
-
-run_pkg() {
-    pkg="$1"
-
-    test -x /usr/bin/openssl || apt-get install --no-install-recommends -yq openssl </dev/null 2>&1
-
-    echo "I: Removing binary package $pkg, to get clean state."
-    apt-get purge -yq $pkg </dev/null 2>&1 >/dev/null || true
-
-    echo "I: Installing binary package $pkg"
-    RC=0
-    apt-get install --no-install-recommends -yq $pkg </dev/null 2>&1 || RC=$?
-    if [ "$RC" -ne 0 ]; then
-        echo "E: Package $pkg failed to install." >&2
-        result=1
-        return
-    fi
-
-    # Try and remove dkms to spot packages which miss a dkms dependency
-    echo "I: Checking for missing dkms dependency by trying to deinstall dkms"
-    dpkg --remove dkms || true
-
-    if ! dkms_conf=$(dpkg -L $pkg | grep '/usr/src' | grep '/dkms.conf$'); then
-        echo "I: Package $pkg has no dkms.conf, skipping."
-        return
-    fi
-
-    check_for_linux_headers
-
-    echo "I: Testing binary package $pkg"
-
-    dkms_pkg=$(bash -c ". $dkms_conf > /dev/null; echo \$PACKAGE_NAME" 2>/dev/null)
-    dkms_ver=$(bash -c ". $dkms_conf > /dev/null; echo \$PACKAGE_VERSION" 2>/dev/null)
-    build_depends=$(bash -c ". $dkms_conf > /dev/null; echo \$BUILD_DEPENDS" 2>/dev/null)
-    versioned_build_depends=
-
-    for bd in $build_depends
-    do
-        bdpath=$(ls -d /usr/src/${bd}-*)
-        versioned_build_depends="$versioned_build_depends ${bd}/${bdpath#/usr/src/${bd}-}"
-    done
-
-    for k in $(ls -dv /lib/modules/*/build)
-    do
-        test -d "$k" || continue
-        kver="${k%/build}"
-        kver="${kver#/lib/modules/}"
-
-        # If any linux-meta is in triggers, only test abistems that
-        # match triggers otherwise continue. This helps integration
-        # with adt-matrix which specifically requests test results
-        # against each individual linux-meta and tracks unique results
-        # per kernel abi.
-        abistem=$(echo $kver | sed 's/-[a-z]*$//')
-        case "${ADT_TEST_TRIGGERS-}" in
-            *linux-meta*)
-                case "$ADT_TEST_TRIGGERS" in
-                    *"$abistem"*)
-                        ;;
-                    *)
-                        continue
-                        ;;
-                esac
-        esac
-
-        for bdv in $versioned_build_depends
-        do
-            echo "I: Trying to install build dependency $bdv for $kver"
-            dkms install "$bdv" -k "$kver" || test $? = 77
-        done
-
-        echo "I: Trying to build $dkms_pkg/$dkms_ver for $kver"
-        res=0
-        dkms build -m "$dkms_pkg" -v "$dkms_ver" -k "$kver" || res=$?
-
-        if [ "$res" = 77 ]; then
-            echo "I: $dkms_pkg/$dkms_ver is not supported on $kver (BUILD_EXCLUSIVE directive), skipping."
-            summary="${summary}I: SKIP $kver${crlf}"
-            continue
-        fi
-
-        if [ "$res" != 0 ]; then
-            echo "E: $dkms_pkg/$dkms_ver failed to build for $kver" >&2
-            makelog="/var/lib/dkms/$dkms_pkg/$dkms_ver/build/make.log"
-            echo "========== $makelog ==========" >&2
-            cat "$makelog" >&2 || true
-            echo "====================" >&2
-            summary="${summary}I: FAIL $kver${crlf}"
-            result=1
-            continue
-        fi
-
-        if ! dkms install --force -m "$dkms_pkg" -v "$dkms_ver" -k "$kver" ; then
-            echo "E: $dkms_pkg/$dkms_ver failed to install for $kver" >&2
-            summary="${summary}I: FAIL $kver${crlf}"
-            result=1
-            continue
-        fi
-
-        echo "I: Testing if $dkms_pkg modules are correctly installed."
-        dkmsstatus="$(dkms status $dkms_pkg -k $kver)"
-        echo "$dkmsstatus"
-        if [ -z "$dkmsstatus" ]; then
-            echo "E: dkms status output is empty!" >&2
-            summary="${summary}I: FAIL $kver${crlf}"
-            result=1
-            continue
-        fi
-
-        if ! echo "$dkmsstatus" | grep -q "installed$"; then
-            echo "E: not installed" >&2
-            summary="${summary}I: FAIL $kver${crlf}"
-            result=1
-            continue
-        fi
-
-        summary="${summary}I: PASS $kver${crlf}"
-
-    done
-
-    # collect build logs as artifacts
-    if [ -d /var/lib/dkms ]; then
-        (cd /var/lib/dkms; find $dkms_pkg -name "make.log" -print0 | xargs -r -0 tar cvz) > "${AUTOPKGTEST_ARTIFACTS:-.}/$pkg-make-logs.tar.gz"
-    fi
-
-    # skip modprobing for now; this fails too often (needs particular
-    # hardware/firmware/etc)
-    # for mod in $(awk -F '"' '/^BUILT_MODULE_NAME/ {print $2}' $dkms_conf); do
-    #     echo "I: modprobe $mod"
-    #     if ! modprobe $mod; then
-    #         echo "E: Failed to modprobe module $mod" >&2
-    #         exit 1
-    #     else
-    #         echo "I: $modname loaded"
-    #     fi
-    # done
-}
-
-# Do not (fail to) build the modules upon linux-header-* and *-dkms package
-# installation, which can cause apt-get to fail. We will do this later with
-# improved error reporting.
-# (This only works if the *-dkms package is not yet installed.)
-touch /etc/dkms/no-autoinstall
-
-pkg_list="$*"
-if [ -z "$pkg_list" ]; then
-    test -x /usr/bin/grep-dctrl || apt-get install --no-install-recommends -yq dctrl-tools </dev/null 2>&1
-    pkg_list="$(grep-dctrl -FDepends -e '(^| )dkms' -o -FPackage -e '\-dkms' debian/control -sPackage -n)"
-fi
-
-for pkg in $pkg_list; do
-    # package might be arch: restriction or udeb etc.
-    if ! apt-cache show $pkg >/dev/null 2>&1; then
-        echo "I: Skipping unavailable package $pkg"
-        continue
-    fi
-    run_pkg $pkg
-done
-
-if [ -n "$summary" ]; then
-    echo "I: Summary:"
-    echo -n "$summary"
-fi
-
-rm -f /etc/dkms/no-autoinstall
-
-exit $result
-
-# vim: sw=4:ts=4:et

hal/phydm/halrf/halrf.h

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

os_dep/linux/ioctl_cfg80211.c

@@ -417,9 +417,7 @@ 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(6, 3, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 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);
@@ -1106,7 +1104,6 @@ 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;
@@ -1141,17 +1138,13 @@ check_bss:
 		RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
 		#endif
 
-		if (check_fwstate(pmlmepriv, WIFI_MONITOR_STATE) != _TRUE) {
+		if (check_fwstate(pmlmepriv, WIFI_MONITOR_STATE) != _TRUE)
-                        struct cfg80211_bss *bss;
+			rtw_cfg80211_connect_result(pwdev, cur_network->network.MacAddress
-                        bss = cfg80211_get_bss(pwdev->wiphy, NULL, cur_network->network.MacAddress, NULL, 0, 
+				, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
-                                IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
+				, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
-                        cfg80211_connect_bss(wdev_to_ndev(pwdev), cur_network->network.MacAddress, bss
+				, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
-                                , pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
+				, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
-                                , pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
+				, WLAN_STATUS_SUCCESS, GFP_ATOMIC);
-                                , 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
@@ -1667,9 +1660,6 @@ 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
@@ -1814,9 +1804,6 @@ 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
@@ -1982,9 +1969,6 @@ 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)) */
@@ -2005,11 +1989,7 @@ 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,
+	struct net_device *ndev, u8 key_index
-#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
@@ -2057,11 +2037,7 @@ 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,
+	struct net_device *ndev, u8 key_index)
-#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((void *)padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */
+		_rtw_memcpy(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,11 +1618,7 @@ 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(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
-        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((void *)pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
+	_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
 
 	if (rtnl_lock_needed)
 		ret = register_netdev(pnetdev);
@@ -2574,9 +2574,7 @@ u64 rtw_division64(u64 x, u64 y)
 inline u32 rtw_random32(void)
 {
 #ifdef PLATFORM_LINUX
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 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;