Prepare for Release

Update to upstream version '5.3.9~git20230921.3fae723'
with Debian dir 8bf8e82b59

Makefile

@@ -7,15 +7,22 @@ EXTRA_CFLAGS += -Wno-unused-label
 EXTRA_CFLAGS += -Wno-unused-parameter
 EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-unused
+EXTRA_CFLAGS += -Wno-address
+EXTRA_CFLAGS += -Wno-cast-function-type
+#EXTRA_CFLAGS += -Wno-discarded-qualifiers
+EXTRA_CFLAGS += -Wno-uninitialized
+EXTRA_CFLAGS += -Wno-sometimes-uninitialized
+EXTRA_CFLAGS += -Wno-enum-conversion
 EXTRA_CFLAGS += -Wno-vla
 EXTRA_CFLAGS += -Wno-date-time
 
+
 GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
 ifeq ($(GCC_VER_49),1)
 EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and later
 endif
 
-EXTRA_CFLAGS += -I$(src)/include
+EXTRA_CFLAGS += -I$(src)/include -I$(srctree)/$(src)/include
 
 EXTRA_LDFLAGS += --strip-debug
 
@@ -159,8 +166,6 @@ CONFIG_PLATFORM_PPC64LE = n
 
 CONFIG_DRVEXT_MODULE = n
 
-export TopDIR ?= $(shell pwd)
-
 ########### COMMON  #################################
 ifeq ($(CONFIG_GSPI_HCI), y)
 HCI_NAME = gspi
@@ -224,10 +229,11 @@ _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/led/hal_$(HCI_NAME)_led.o
 
 
-EXTRA_CFLAGS += -I$(src)/platform
+EXTRA_CFLAGS += -I$(src)/platform -I$(srctree)/$(src)/platform
 _PLATFORM_FILES := platform/platform_ops.o
 
-EXTRA_CFLAGS += -I$(src)/hal/btc
+EXTRA_CFLAGS += -I$(src)/hal/btc -I$(srctree)/$(src)/hal/btc
+EXTRA_CFLAGS += -I$(src)/hal/phydm -I$(srctree)/$(src)/hal/phydm
 
 ########### HAL_RTL8188E #################################
 ifeq ($(CONFIG_RTL8188E), y)
@@ -775,16 +781,16 @@ endif
 ifeq ($(CONFIG_AUTOCFG_CP), y)
 
 ifeq ($(CONFIG_MULTIDRV), y)
-$(shell cp $(TopDIR)/autoconf_multidrv_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
+$(shell cp autoconf_multidrv_$(HCI_NAME)_linux.h include/autoconf.h)
 else
 ifeq ($(CONFIG_RTL8188E)$(CONFIG_SDIO_HCI),yy)
-$(shell cp $(TopDIR)/autoconf_rtl8189e_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
+$(shell cp autoconf_rtl8189e_$(HCI_NAME)_linux.h include/autoconf.h)
 else ifeq ($(CONFIG_RTL8188F)$(CONFIG_SDIO_HCI),yy)
-$(shell cp $(TopDIR)/autoconf_rtl8189f_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
+$(shell cp autoconf_rtl8189f_$(HCI_NAME)_linux.h include/autoconf.h)
 else ifeq ($(CONFIG_RTL8723C),y)
-$(shell cp $(TopDIR)/autoconf_rtl8723c_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
+$(shell cp autoconf_rtl8723c_$(HCI_NAME)_linux.h include/autoconf.h)
 else
-$(shell cp $(TopDIR)/autoconf_$(RTL871X)_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
+$(shell cp autoconf_$(RTL871X)_$(HCI_NAME)_linux.h include/autoconf.h)
 endif
 endif
 

README.md

@@ -14,30 +14,41 @@
 
 
 # Supports
-* Android 7
+* Android 12/13
 * MESH Support
 * Monitor mode
 * Frame injection
-* Up to kernel v5.8+
+* 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.
+1. Compile and install the driver:
-2. `echo 'blacklist r8188eu'|sudo tee -a '/etc/modprobe.d/realtek.conf'`
+```
-3. `make && sudo make install`
+cd rtl8188eus
-4. Reboot in order to blacklist and load the new driver/module.
+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 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!)
 ```
-$ aireplay -9 <interface>
+sudo aireplay-ng -9 <interface>
 ```
 
 # NetworkManager configuration

core/efuse/rtw_efuse.c

@@ -711,13 +711,14 @@ void rtw_efuse_analyze(PADAPTER	padapter, u8 Type, u8 Fake)
 	j = 0;
 
 	for (i = 0; i < mapLen; i++) {
-		if (i % 16 == 0)
+		if (i % 16 == 0) {
 			RTW_PRINT_SEL(RTW_DBGDUMP, "0x%03x: ", i);
 			_RTW_PRINT_SEL(RTW_DBGDUMP, "%02X%s"
 				, pEfuseHal->fakeEfuseInitMap[i]
 				, ((i + 1) % 16 == 0) ? "\n" : (((i + 1) % 8 == 0) ? "	  " : " ")
 			);
 		}
+	}
 	_RTW_PRINT_SEL(RTW_DBGDUMP, "\n");
 	if (eFuseWord)
 		rtw_mfree((u8 *)eFuseWord, EFUSE_MAX_SECTION_NUM * (EFUSE_MAX_WORD_UNIT * 2));

core/rtw_br_ext.c

@@ -15,9 +15,12 @@
 #define _RTW_BR_EXT_C_
 
 #ifdef __KERNEL__
+    #include <linux/version.h>
 	#include <linux/if_arp.h>
 	#include <net/ip.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
 	#include <net/ipx.h>
+#endif
 	#include <linux/atalk.h>
 	#include <linux/udp.h>
 	#include <linux/if_pppox.h>
@@ -114,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;
 }
 
@@ -948,6 +957,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
 			}
 		}
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
 		/*   IPX  */
 		if (ipx != NULL) {
 			switch (method) {
@@ -1016,8 +1026,12 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
 			}
 		}
 
+
 		/*   AARP  */
 		else if (ea != NULL) {
+#else
+		if (ea != NULL) {
+#endif
 			/* Sanity check fields. */
 			if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
 				DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");

core/rtw_mlme_ext.c

@@ -1831,11 +1831,13 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
 			ptable->func = &OnAuth;
 		else
 			ptable->func = &OnAuthClient;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+		_mgt_dispatcher(padapter, ptable, precv_frame);
-	__attribute__ ((fallthrough));
+//#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
-#else
+//	__attribute__ ((fallthrough));
-			__attribute__ ((__fallthrough__));
+//#else
-#endif
+//			__attribute__ ((fallthrough));
+//#endif
+        break;
 	case WIFI_ASSOCREQ:
 	case WIFI_REASSOCREQ:
 		_mgt_dispatcher(padapter, ptable, precv_frame);

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:

core/rtw_security.c

@@ -1575,7 +1575,7 @@ u32	rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe)
 	pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
 
 	/* 4 start to encrypt each fragment */
-	if ((pattrib->encrypt == _AES_)) {
+	if (pattrib->encrypt == _AES_) {
 		/*
 				if(pattrib->psta)
 				{
@@ -1930,7 +1930,7 @@ u32	rtw_aes_decrypt(_adapter *padapter, u8 *precvframe)
 	u32	res = _SUCCESS;
 	pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
 	/* 4 start to encrypt each fragment */
-	if ((prxattrib->encrypt == _AES_)) {
+	if (prxattrib->encrypt == _AES_) {
 
 		stainfo = rtw_get_stainfo(&padapter->stapriv , &prxattrib->ta[0]);
 		if (stainfo != NULL) {
@@ -2133,8 +2133,7 @@ BIP_exit:
 #ifndef PLATFORM_FREEBSD
 #if defined(CONFIG_TDLS)
 /* compress 512-bits */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+static int rtw_sha256_compress(struct rtw_sha256_state *md, unsigned char *buf)
-static int sha256_compress(struct sha256_state *md, unsigned char *buf)
 {
 	u32 S[8], W[64], t0, t1;
 	u32 t;
@@ -2180,11 +2179,9 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
 		md->state[i] = md->state[i] + S[i];
 	return 0;
 }
-#endif
 
 /* Initialize the hash state */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+static void rtw_sha256_init(struct rtw_sha256_state *md)
-static void sha256_init(struct sha256_state *md)
 {
 	md->curlen = 0;
 	md->length = 0;
@@ -2197,7 +2194,6 @@ static void sha256_init(struct sha256_state *md)
 	md->state[6] = 0x1F83D9ABUL;
 	md->state[7] = 0x5BE0CD19UL;
 }
-#endif
 
 /**
    Process a block of memory though the hash
@@ -2206,9 +2202,7 @@ static void sha256_init(struct sha256_state *md)
    @param inlen  The length of the data (octets)
    @return CRYPT_OK if successful
 */
-
+static int rtw_sha256_process(struct rtw_sha256_state *md, unsigned char *in,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
-static int sha256_process(struct sha256_state *md, unsigned char *in,
 			  unsigned long inlen)
 {
 	unsigned long n;
@@ -2219,7 +2213,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
 
 	while (inlen > 0) {
 		if (md->curlen == 0 && inlen >= block_size) {
-			if (sha256_compress(md, (unsigned char *) in) < 0)
+			if (rtw_sha256_compress(md, (unsigned char *) in) < 0)
 				return -1;
 			md->length += block_size * 8;
 			in += block_size;
@@ -2231,7 +2225,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
 			in += n;
 			inlen -= n;
 			if (md->curlen == block_size) {
-				if (sha256_compress(md, md->buf) < 0)
+				if (rtw_sha256_compress(md, md->buf) < 0)
 					return -1;
 				md->length += 8 * block_size;
 				md->curlen = 0;
@@ -2241,7 +2235,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
 
 	return 0;
 }
-#endif
+
 
 /**
    Terminate the hash to get the digest
@@ -2249,8 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
    @param out [out] The destination of the hash (32 bytes)
    @return CRYPT_OK if successful
 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+static int rtw_sha256_done(struct rtw_sha256_state *md, unsigned char *out)
-static int sha256_done(struct sha256_state *md, unsigned char *out)
 {
 	int i;
 
@@ -2270,7 +2263,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
 	if (md->curlen > 56) {
 		while (md->curlen < 64)
 			md->buf[md->curlen++] = (unsigned char) 0;
-		sha256_compress(md, md->buf);
+		rtw_sha256_compress(md, md->buf);
 		md->curlen = 0;
 	}
 
@@ -2280,7 +2273,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
 
 	/* store length */
 	WPA_PUT_BE64(md->buf + 56, md->length);
-	sha256_compress(md, md->buf);
+	rtw_sha256_compress(md, md->buf);
 
 	/* copy output */
 	for (i = 0; i < 8; i++)
@@ -2288,7 +2281,6 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
 
 	return 0;
 }
-#endif
 
 /**
  * sha256_vector - SHA256 hash for data vector
@@ -2298,23 +2290,20 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
  * @mac: Buffer for the hash
  * Returns: 0 on success, -1 of failure
  */
-
+static int rtw_sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
-static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
 			 u8 *mac)
 {
-	struct sha256_state ctx;
+	struct rtw_sha256_state ctx;
 	size_t i;
 
-	sha256_init(&ctx);
+	rtw_sha256_init(&ctx);
 	for (i = 0; i < num_elem; i++)
-		if (sha256_process(&ctx, addr[i], len[i]))
+		if (rtw_sha256_process(&ctx, addr[i], len[i]))
 			return -1;
-	if (sha256_done(&ctx, mac))
+	if (rtw_sha256_done(&ctx, mac))
 		return -1;
 	return 0;
 }
-#endif
 
 static u8 os_strlen(const char *s)
 {
@@ -2355,7 +2344,6 @@ static int os_memcmp(const void *s1, const void *s2, u8 n)
  * @mac: Buffer for the hash (32 bytes)
  */
 #if defined(CONFIG_TDLS)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
 static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
 			       u8 *addr[], size_t *len, u8 *mac)
 {
@@ -2374,7 +2362,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
 
 	/* if key is longer than 64 bytes reset it to key = SHA256(key) */
 	if (key_len > 64) {
-		sha256_vector(1, &key, &key_len, tk);
+		rtw_sha256_vector(1, &key, &key_len, tk);
 		key = tk;
 		key_len = 32;
 	}
@@ -2402,7 +2390,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
 		_addr[i + 1] = addr[i];
 		_len[i + 1] = len[i];
 	}
-	sha256_vector(1 + num_elem, _addr, _len, mac);
+	rtw_sha256_vector(1 + num_elem, _addr, _len, mac);
 
 	_rtw_memset(k_pad, 0, sizeof(k_pad));
 	_rtw_memcpy(k_pad, key, key_len);
@@ -2415,9 +2403,8 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
 	_len[0] = 64;
 	_addr[1] = mac;
 	_len[1] = 32;
-	sha256_vector(2, _addr, _len, mac);
+	rtw_sha256_vector(2, _addr, _len, mac);
 }
-#endif
 #endif /* CONFIG_TDLS */
 #endif /* PLATFORM_FREEBSD */
 /**
@@ -2435,8 +2422,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
  */
 #ifndef PLATFORM_FREEBSD /* Baron */
 #if defined(CONFIG_TDLS)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+static void rtw_sha256_prf(u8 *key, size_t key_len, char *label,
-static void sha256_prf(u8 *key, size_t key_len, char *label,
 		       u8 *data, size_t data_len, u8 *buf, size_t buf_len)
 {
 	u16 counter = 1;
@@ -2460,10 +2446,10 @@ static void sha256_prf(u8 *key, size_t key_len, char *label,
 	while (pos < buf_len) {
 		plen = buf_len - pos;
 		WPA_PUT_LE16(counter_le, counter);
-		if (plen >= SHA256_MAC_LEN) {
+		if (plen >= RTW_SHA256_MAC_LEN) {
 			hmac_sha256_vector(key, key_len, 4, addr, len,
 					   &buf[pos]);
-			pos += SHA256_MAC_LEN;
+			pos += RTW_SHA256_MAC_LEN;
 		} else {
 			hmac_sha256_vector(key, key_len, 4, addr, len, hash);
 			_rtw_memcpy(&buf[pos], hash, plen);
@@ -2473,7 +2459,6 @@ static void sha256_prf(u8 *key, size_t key_len, char *label,
 	}
 }
 #endif
-#endif
 #endif /* PLATFORM_FREEBSD Baron */
 
 /* AES tables*/
@@ -3123,7 +3108,7 @@ void wpa_tdls_generate_tpk(_adapter *padapter, void *sta)
 		nonce[1] = SNonce;
 	}
 
-	sha256_vector(2, nonce, len, key_input);
+	rtw_sha256_vector(2, nonce, len, key_input);
 
 	/*
 	 * TPK-Key-Data = KDF-N_KEY(TPK-Key-Input, "TDLS PMK",
@@ -3142,7 +3127,7 @@ void wpa_tdls_generate_tpk(_adapter *padapter, void *sta)
 	}
 	_rtw_memcpy(data + 2 * ETH_ALEN, get_bssid(pmlmepriv), ETH_ALEN);
 
-	sha256_prf(key_input, SHA256_MAC_LEN, "TDLS PMK", data, sizeof(data), (u8 *) &psta->tpk, sizeof(psta->tpk));
+	rtw_sha256_prf(key_input, RTW_SHA256_MAC_LEN, "TDLS PMK", data, sizeof(data), (u8 *) &psta->tpk, sizeof(psta->tpk));
 
 
 }

debian/README.Debian

@@ -1,5 +1,4 @@
-realtek-rtl8188eus-dkms for Debian
+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,3 +1,102 @@
+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 ]
+  * 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

debian/control

@@ -3,8 +3,8 @@ 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
+Build-Depends: debhelper-compat (= 13), dh-sequence-dkms
-Standards-Version: 4.5.1
+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
@@ -16,4 +16,3 @@ 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

@@ -10,7 +10,7 @@ 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>
+           2008-2014 Patrick McHardy <kaber@trash.net>
 License: GPL-2
 
 Files: debian/*

debian/patches/Change-dkms-version.patch

@@ -1,20 +0,0 @@
-From: Sophie Brun <sophie@offensive-security.com>
-Date: Fri, 10 Jul 2020 08:49:31 +0200
-Subject: Change dkms version
-
-Forwarded: not-needed
----
- dkms.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dkms.conf b/dkms.conf
-index 1c14127..0ec5a51 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_git20210206.1e7145f"
- CLEAN="'make' clean"
- BUILT_MODULE_NAME[0]=8188eu
- PROCS_NUM=`nproc`

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

@@ -0,0 +1,19 @@
+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 -
+ 1 file changed, 1 deletion(-)
+
+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

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

@@ -0,0 +1,25 @@
+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 +1,2 @@
-Change-dkms-version.patch
+add-support-kernel-5.17.patch
+add-linux-6.1-support.patch

debian/realtek-rtl8188eus-dkms.install

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

debian/rules

@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE = 1
 
 include /usr/share/dpkg/pkg-info.mk
 export DEB_VERSION_UPSTREAM
 
 %:
-	dh $@ --with dkms
+	dh $@
 
 override_dh_dkms:
-	dh_dkms -V $(DEB_VERSION_UPSTREAM) -- dkms.conf
+	# 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
 
-override_dh_fixperms:
+execute_after_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

debian/source/lintian-overrides

@@ -1,2 +0,0 @@
-#we export the variable provided by /usr/share/dpkg/pkg-info.mk
-realtek-rtl8188eus-dkms source: dh-exec-subst-unknown-variable debian/realtek-rtl8188eus-dkms.install DEB_VERSION_UPSTREAM

debian/tests/control

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

debian/tests/dkms-autopkgtest

@@ -0,0 +1,229 @@
+#!/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

debian/upstream/metadata

@@ -0,0 +1,5 @@
+---
+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

dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-rtl8188eus"
-PACKAGE_VERSION="5.3.9~20200316"
+PACKAGE_VERSION="5.3.9~20221105"
 CLEAN="'make' clean"
 BUILT_MODULE_NAME[0]=8188eu
 PROCS_NUM=`nproc`

hal/hal_dm.c

@@ -407,7 +407,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
 		return;
 	}
 
-	if ((pregpriv->wifi_spec == 1)) { /* || (pmlmeinfo->HT_enable == 0)) */
+	if (pregpriv->wifi_spec == 1) { /* || (pmlmeinfo->HT_enable == 0)) */
 		precvpriv->is_any_non_be_pkts = _FALSE;
 		return;
 	}

hal/hal_mp.c

@@ -171,7 +171,7 @@ void hal_mpt_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14)
 	} else if (IS_HARDWARE_TYPE_8723D(Adapter)) {
 		/* 2.4G CCK TX DFIR */
 		/* 2016.01.20 Suggest from RS BB mingzhi*/
-		if ((u1Channel == 14)) {
+		if (u1Channel == 14) {
 			phy_set_bb_reg(Adapter, rCCK0_TxFilter2, bMaskDWord, 0x0000B81C);
 			phy_set_bb_reg(Adapter, rCCK0_DebugPort, bMaskDWord, 0x00000000);
 			phy_set_bb_reg(Adapter, 0xAAC, bMaskDWord, 0x00003667);

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
 );
 

hal/phydm/halrf/halrf_features.h

@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifndef	__HALRF_FEATURES_H__
-#define __HALRF_FEATURES
+#define __HALRF_FEATURES_H__
 
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 

hal/phydm/halrf/halrf_kfree.h

@@ -25,7 +25,7 @@
 
 
 #ifndef	__PHYDMKFREE_H__
-#define    __PHYDKFREE_H__
+#define    __PHYDMKFREE_H__
 
 #define KFREE_VERSION	"1.0"
 

hal/phydm/phydm_phystatus.c

@@ -52,12 +52,10 @@ phydm_rx_statistic_cal(
 		phydm->phy_dbg_info.ht_pkt_not_zero = true;
 
 		if (phydm->support_ic_type & PHYSTS_2ND_TYPE_IC) {
-			if ((bw_idx == *phydm->band_width)) {
+			if (bw_idx == *phydm->band_width) {
-				
 				phydm->phy_dbg_info.num_qry_ht_pkt[date_rate - ODM_RATEMCS0]++;
 
 			} else if (bw_idx == CHANNEL_WIDTH_20) {
-			
 				phydm->phy_dbg_info.num_qry_pkt_sc_20m[date_rate - ODM_RATEMCS0]++;
 				phydm->phy_dbg_info.low_bw_20_occur = true;
 			}
@@ -68,9 +66,9 @@ phydm_rx_statistic_cal(
 	#if ODM_IC_11AC_SERIES_SUPPORT
 	else if (date_rate <= ODM_RATEVHTSS4MCS9) {
 		#if (ODM_PHY_STATUS_NEW_TYPE_SUPPORT == 1)
-		if ((phy_status_type == 1) && 
+		if ((phy_status_type == 1) &&
-			(phy_sta_rpt->gid != 0) && 
+			(phy_sta_rpt->gid != 0) &&
-			(phy_sta_rpt->gid != 63) && 
+			(phy_sta_rpt->gid != 63) &&
 			(phydm->support_ic_type & PHYSTS_2ND_TYPE_IC)) {
 			phydm->phy_dbg_info.num_qry_mu_vht_pkt[date_rate - ODM_RATEVHTSS1MCS0]++;
 			if (pktinfo->ppdu_cnt < 4) {
@@ -81,7 +79,6 @@ phydm_rx_statistic_cal(
 		#endif
 		{
 			phydm->phy_dbg_info.vht_pkt_not_zero = true;
-			
 			if (phydm->support_ic_type & PHYSTS_2ND_TYPE_IC) {
 				if ((bw_idx == *phydm->band_width)) {
 					phydm->phy_dbg_info.num_qry_vht_pkt[date_rate - ODM_RATEVHTSS1MCS0]++;

include/ieee80211.h

@@ -1529,12 +1529,13 @@ enum ieee80211_state {
 	(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
 				     (((Addr[5]) & 0xff) == 0xff))
 #else
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 00))
 extern __inline int is_multicast_mac_addr(const u8 *addr)
 {
 	return (addr[0] != 0xff) && (0x01 & addr[0]);
 }
 
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
+static __inline int is_broadcast_mac_addr(const u8 *addr)
 {
 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
@@ -1545,6 +1546,24 @@ extern __inline int is_zero_mac_addr(const u8 *addr)
 	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
 		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
 }
+#else 
+static __inline int is_multicast_mac_addr(const u8 *addr)
+{
+	return (addr[0] != 0xff) && (0x01 & addr[0]);
+}
+
+static __inline int is_broadcast_mac_addr(const u8 *addr)
+{
+	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+}
+
+static __inline int is_zero_mac_addr(const u8 *addr)
+{
+	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
+		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
+}
+#endif /* LINUX_VERSION_CODE */
 #endif /* PLATFORM_FREEBSD */
 
 #define CFG_IEEE80211_RESERVE_FCS (1<<0)

include/rtw_security.h

@@ -41,7 +41,7 @@ const char *security_type_str(u8 value);
 #define _WPA_IE_ID_	0xdd
 #define _WPA2_IE_ID_	0x30
 
-#define SHA256_MAC_LEN 32
+#define RTW_SHA256_MAC_LEN 32
 #define AES_BLOCK_SIZE 16
 #define AES_PRIV_SIZE (4 * 44)
 
@@ -249,13 +249,11 @@ struct security_priv {
 #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+struct rtw_sha256_state {
-struct sha256_state {
 	u64 length;
 	u32 state[8], curlen;
 	u8 buf[64];
 };
-#endif
 
 #define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
 	do {\

os_dep/linux/ioctl_cfg80211.c

@@ -27,7 +27,7 @@
 #define DBG_RTW_CFG80211_MESH_CONF 0
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) || defined(RHEL79))
 #define STATION_INFO_INACTIVE_TIME	BIT(NL80211_STA_INFO_INACTIVE_TIME)
 #define STATION_INFO_LLID			BIT(NL80211_STA_INFO_LLID)
 #define STATION_INFO_PLID			BIT(NL80211_STA_INFO_PLID)
@@ -289,7 +289,7 @@ static const char *nl80211_chan_width_str(enum nl80211_chan_width cwidth)
 		return "80+80";
 	case NL80211_CHAN_WIDTH_160:
 		return "160";
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) || defined(RHEL79))
 	case NL80211_CHAN_WIDTH_5:
 		return "5";
 	case NL80211_CHAN_WIDTH_10:
@@ -390,7 +390,7 @@ static void rtw_get_chbw_from_cfg80211_chan_def(struct cfg80211_chan_def *chdef,
 			*ch = chan->hw_value;
 		break;
 	case NL80211_CHAN_WIDTH_80P80:
-	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
+	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) || defined(RHEL79))
 	case NL80211_CHAN_WIDTH_5:
 	case NL80211_CHAN_WIDTH_10:
 	#endif
@@ -417,7 +417,13 @@ 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))
+        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);
+#endif
 
 #else
 	int freq = rtw_ch2freq(ch);
@@ -944,7 +950,7 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter)
 	struct wlan_network  *cur_network = &(pmlmepriv->cur_network);
 	struct wireless_dev *pwdev = padapter->rtw_wdev;
 	struct cfg80211_bss *bss = NULL;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL79))
 	struct wiphy *wiphy = pwdev->wiphy;
 	int freq = 2412;
 	struct ieee80211_channel *notify_channel;
@@ -1002,7 +1008,7 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter)
 			RTW_PRINT(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
 	}
 	/* notify cfg80211 that device joined an IBSS */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL79))
 	notify_channel = ieee80211_get_channel(wiphy, freq);
 	cfg80211_ibss_joined(padapter->pnetdev, cur_network->network.MacAddress, notify_channel, GFP_ATOMIC);
 #else
@@ -1090,7 +1096,7 @@ check_bss:
 		struct ieee80211_channel *notify_channel;
 		u32 freq;
 		u16 channel = cur_network->network.Configuration.DSConfig;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL79))
 		struct cfg80211_roam_info roam_info;
 #endif
 
@@ -1098,8 +1104,13 @@ check_bss:
 		notify_channel = ieee80211_get_channel(wiphy, freq);
 		#endif
 
-		#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+		#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;
+		#endif
 		roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2;
 		roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2;
 		roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6;
@@ -1126,18 +1137,22 @@ check_bss:
 			rtw_ft_set_status(padapter, RTW_FT_ASSOCIATED_STA);
 #endif
 	} else {
-		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
+		#if !defined(RHEL79) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE))
 		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) {
-			rtw_cfg80211_connect_result(pwdev, cur_network->network.MacAddress
+                        struct cfg80211_bss *bss;
-				, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
+                        bss = cfg80211_get_bss(pwdev->wiphy, NULL, cur_network->network.MacAddress, NULL, 0, 
-				, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
+                                IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
-				, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
+                        cfg80211_connect_bss(wdev_to_ndev(pwdev), cur_network->network.MacAddress, bss
-				, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
+                                , pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
-				, WLAN_STATUS_SUCCESS, GFP_ATOMIC);
+                                , pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
-		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
+                                , 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
 	}
@@ -1193,7 +1208,7 @@ void rtw_cfg80211_indicate_disconnect(_adapter *padapter, u16 reason, u8 locally
 	_enter_critical_bh(&pwdev_priv->connect_req_lock, &irqL);
 
 	if (padapter->ndev_unregistering || !rtw_wdev_not_indic_disco(pwdev_priv)) {
-		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
+		#if (!defined(RHEL79) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)))
 		RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
 
 		if (pwdev->sme_state == CFG80211_SME_CONNECTING) {
@@ -1652,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
@@ -1796,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
@@ -1961,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)) */
@@ -1981,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
@@ -2029,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
@@ -2448,7 +2480,7 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
 	struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(adapter);
 	_irqL	irqL;
 
-#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
 	struct cfg80211_scan_info info;
 
 	memset(&info, 0, sizeof(info));
@@ -2465,7 +2497,7 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
 		if (pwdev_priv->scan_request->wiphy != pwdev_priv->rtw_wdev->wiphy)
 			RTW_INFO("error wiphy compare\n");
 		else
-#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
 			cfg80211_scan_done(pwdev_priv->scan_request, &info);
 #else
 			cfg80211_scan_done(pwdev_priv->scan_request, aborted);
@@ -3055,7 +3087,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
 
 check_need_indicate_scan_done:
 	if (_TRUE == need_indicate_scan_done) {
-#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
 		struct cfg80211_scan_info info;
 
 		memset(&info, 0, sizeof(info));
@@ -3063,7 +3095,7 @@ check_need_indicate_scan_done:
 #endif
 
 		_rtw_cfg80211_surveydone_event_callback(padapter, request);
-#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
+#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
 		cfg80211_scan_done(request, &info);
 #else
 		cfg80211_scan_done(request, 0);
@@ -4460,6 +4492,12 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name,
 		goto out;
 	}
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
+	mon_ndev->min_mtu = WLAN_MIN_ETHFRM_LEN;
+	mon_ndev->mtu = WLAN_DATA_MAXLEN;
+	mon_ndev->max_mtu = WLAN_DATA_MAXLEN;
+#endif
+
 	mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP;
 	strncpy(mon_ndev->name, name, IFNAMSIZ);
 	mon_ndev->name[IFNAMSIZ - 1] = 0;
@@ -4870,7 +4908,11 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
 	return ret;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
+#else
 static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
+#endif
 {
 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
 
@@ -7088,34 +7130,24 @@ exit:
 	return ret;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy,
+                                             struct wireless_dev *wdev,
+                                             struct mgmt_frame_regs *upd)
+#else
 static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
 	struct wireless_dev *wdev,
 #else
 	struct net_device *ndev,
 #endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-	struct mgmt_frame_regs *upd)
-#else
 	u16 frame_type, bool reg)
 #endif
-
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-	u32 rtw_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4);
-#endif
-    
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
 	struct net_device *ndev = wdev_to_ndev(wdev);
 #endif
-
-/* hardcoded always true, to make it pass compilation */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-	bool reg = true;
-#endif
-
 	_adapter *adapter;
-
 	struct rtw_wdev_priv *pwdev_priv;
 
 	if (ndev == NULL)
@@ -7125,40 +7157,10 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
 	pwdev_priv = adapter_wdev_data(adapter);
 
 #ifdef CONFIG_DEBUG_CFG80211
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
 	RTW_INFO(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
 		frame_type, reg);
-#else
-	RTW_INFO(FUNC_ADPT_FMT " old_regs:%x new_regs:%x\n",
-		 FUNC_ADPT_ARG(adapter), pwdev_priv->mgmt_mask, upd->interface_stypes);
-#endif    
 #endif
 
-	/* Wait QC Verify */
-	return;
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-	switch (upd->interface_stypes) {
-#else
-	switch (frame_type) {
-#endif
-
-	case IEEE80211_STYPE_PROBE_REQ: /* 0x0040 */
-		SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, reg);
-		break;
-	case IEEE80211_STYPE_ACTION: /* 0x00D0 */
-		SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_ACTION, reg);
-		break;
-	default:
-		break;
-	}
-#else
-	if ((upd->interface_stypes & rtw_mask) == (pwdev_priv->mgmt_mask & rtw_mask))
- 		return;
-
-	pwdev_priv->mgmt_mask = upd->interface_stypes;
-#endif
-	
 exit:
 	return;
 }
@@ -9146,7 +9148,8 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy)
 #endif
 
 #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \
-			   LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
+			   LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && \
+                           !defined(RHEL79))
 	wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
 #ifdef CONFIG_PNO_SUPPORT
 	wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
@@ -9157,7 +9160,7 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy)
 #endif
 
 #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) && !defined(RHEL79))
 	wiphy->wowlan = wowlan_stub;
 #else
 	wiphy->wowlan = &wowlan_stub;
@@ -9464,7 +9467,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-	.update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register,
+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register,
 #else
 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
 #endif
@@ -9667,7 +9670,11 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
 	rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
 
 	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
+	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+	if (wdev->connected) {
+	#else
 	if (wdev->current_bss) {
+	#endif
 		RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
 		rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
 	}
@@ -9801,3 +9808,5 @@ void rtw_cfg80211_dev_res_unregister(struct dvobj_priv *dvobj)
 	rtw_wiphy_unregister(dvobj_to_wiphy(dvobj));
 #endif
 }
+
+#endif /* CONFIG_IOCTL_CFG80211 */

os_dep/linux/ioctl_cfg80211.h

@@ -362,8 +362,8 @@ void rtw_cfg80211_deinit_rfkill(struct wiphy *wiphy);
 
 #define rtw_cfg80211_connect_result(wdev, bssid, req_ie, req_ie_len, resp_ie, resp_ie_len, status, gfp) cfg80211_connect_result(wdev_to_ndev(wdev), bssid, req_ie, req_ie_len, resp_ie, resp_ie_len, status, gfp)
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) && !defined(RHEL79))
-#define rtw_cfg80211_disconnected(wdev, reason, ie, ie_len, locally_generated, gfp) cfg80211_disconnected(wdev_to_ndev(wdev), reason, ie, ie_len, gfp)
+#define rtw_cfg80211_disconnected(wdev, reason, ie, ie_len, locally_generated, gfp) cfg80211_disconnected(wdev_to_ndev(wdev), reason, ie, ie_len, ie_len, gfp)
 #else
 #define rtw_cfg80211_disconnected(wdev, reason, ie, ie_len, locally_generated, gfp) cfg80211_disconnected(wdev_to_ndev(wdev), reason, ie, ie_len, locally_generated, gfp)
 #endif
@@ -384,7 +384,7 @@ void rtw_cfg80211_deinit_rfkill(struct wiphy *wiphy);
 u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8 ht);
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL79) )
 #define NL80211_BAND_2GHZ IEEE80211_BAND_2GHZ
 #define NL80211_BAND_5GHZ IEEE80211_BAND_5GHZ
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))

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

@@ -1199,7 +1199,11 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *addr)
 	}
 
 	_rtw_memcpy(adapter_mac_addr(padapter), sa->sa_data, ETH_ALEN); /* set mac addr to adapter */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
+	eth_hw_addr_set(pnetdev, sa->sa_data);
+#else
 	_rtw_memcpy(pnetdev->dev_addr, sa->sa_data, ETH_ALEN); /* set mac addr to net_device */
+#endif
 
 #if 0
 	if (rtw_is_hw_init_completed(padapter)) {
@@ -1513,6 +1517,12 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
 	if (!pnetdev)
 		return NULL;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
+	pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN;
+	pnetdev->mtu = WLAN_DATA_MAXLEN;
+	pnetdev->max_mtu = WLAN_DATA_MAXLEN;
+#endif
+
 	padapter = rtw_netdev_priv(pnetdev);
 	padapter->pnetdev = pnetdev;
 
@@ -1608,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)
@@ -1622,7 +1636,11 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
 	/* alloc netdev name */
 	rtw_init_netdev_name(ndev, name);
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
+	eth_hw_addr_set(ndev, adapter_mac_addr(adapter));
+#else
 	_rtw_memcpy(ndev->dev_addr, adapter_mac_addr(adapter), ETH_ALEN);
+#endif
 #if defined(CONFIG_NET_NS)
     dev_net_set(ndev, wiphy_net(adapter_to_wiphy(adapter)));
 #endif //defined(CONFIG_NET_NS)

os_dep/linux/recv_linux.c

@@ -354,7 +354,11 @@ static int napi_recv(_adapter *padapter, int budget)
 
 #ifdef CONFIG_RTW_GRO
 		if (pregistrypriv->en_gro) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0))
 			if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_DROP)
+#else
+			if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_MERGED_FREE)
+#endif
 				rx_ok = _TRUE;
 			goto next;
 		}

os_dep/linux/rtw_cfgvendor.c

@@ -145,7 +145,7 @@ struct sk_buff *rtw_cfg80211_vendor_event_alloc(
 	struct sk_buff *skb;
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0))
-	skb = cfg80211_vendor_event_alloc(wiphy, len, event_id, gfp);
+	skb = cfg80211_vendor_event_alloc(wiphy, NULL, len, event_id, gfp);
 #else
 	skb = cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp);
 #endif

os_dep/linux/rtw_proc.c

@@ -45,6 +45,10 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void)
 #define get_proc_net init_net.proc_net
 #endif
 
+#if(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
+#define PDE_DATA(inode) pde_data(inode)
+#endif
+
 inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_dir_entry *parent, void *data)
 {
 	struct proc_dir_entry *entry;

os_dep/linux/usb_intf.c

@@ -159,7 +159,8 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
 	{USB_DEVICE(0x2001, 0x3310), .driver_info = RTL8188E}, /* Dlink DWA-123 REV D1 */ 
 	{USB_DEVICE(0x2001, 0x3311), .driver_info = RTL8188E}, /* DLink GO-USB-N150 REV B1 */ 
 	{USB_DEVICE(0x2001, 0x331B), .driver_info = RTL8188E}, /* DLink DWA-121 REV B1 */ 
-	{USB_DEVICE(0x056E, 0x4008), .driver_info = RTL8188E}, /* Elecom WDC-150SU2M */ 	
+	{USB_DEVICE(0x056E, 0x4008), .driver_info = RTL8188E}, /* Elecom WDC-150SU2M */ 
+	{USB_DEVICE(0x7392, 0xB811), .driver_info = RTL8188E}, /* Edimax EW-7811UN v2 */
 #endif
 
 #ifdef CONFIG_RTL8812A

os_dep/linux/wifi_regd.c

@@ -294,7 +294,7 @@ void rtw_regd_apply_flags(struct wiphy *wiphy)
 			&& rtw_odm_dfs_domain_unknown(padapter)
 			#endif
 		) {
-			#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
+			#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(RHEL79))
 			ch->flags = (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_PASSIVE_SCAN);
 			#else
 			ch->flags = IEEE80211_CHAN_NO_IR;
@@ -309,7 +309,7 @@ void rtw_regd_apply_flags(struct wiphy *wiphy)
 			#endif
 		) {
 			ch->flags |= IEEE80211_CHAN_RADAR;
-			#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
+			#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(RHEL79))
 			ch->flags |= (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_PASSIVE_SCAN);
 			#else
 			ch->flags |= IEEE80211_CHAN_NO_IR;
@@ -374,7 +374,7 @@ static void _rtw_regd_init_wiphy(struct rtw_regulatory *reg, struct wiphy *wiphy
 	wiphy->reg_notifier = rtw_reg_notifier;
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(RHEL79))
 	wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
 	wiphy->flags &= ~WIPHY_FLAG_STRICT_REGULATORY;
 	wiphy->flags &= ~WIPHY_FLAG_DISABLE_BEACON_HINTS;

os_dep/osdep_service.c

@@ -1268,8 +1268,12 @@ u32 _rtw_down_sema(_sema *sema)
 inline void thread_exit(_completion *comp)
 {
 #ifdef PLATFORM_LINUX
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
+	kthread_complete_and_exit(comp, 0);
+#else
 	complete_and_exit(comp, 0);
 #endif
+#endif
 
 #ifdef PLATFORM_FREEBSD
 	printf("%s", "RTKTHREAD_exit");
@@ -2341,6 +2345,12 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_p
 	if (!pnetdev)
 		goto RETURN;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
+	pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN;
+	pnetdev->mtu = WLAN_MAX_ETHFRM_LEN;
+	pnetdev->max_mtu = WLAN_DATA_MAXLEN;
+#endif
+
 	pnpi = netdev_priv(pnetdev);
 	pnpi->priv = old_priv;
 	pnpi->sizeof_priv = sizeof_priv;
@@ -2362,6 +2372,12 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv)
 	if (!pnetdev)
 		goto RETURN;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
+	pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN;
+	pnetdev->mtu = WLAN_MAX_ETHFRM_LEN;
+	pnetdev->max_mtu = WLAN_DATA_MAXLEN;
+#endif
+
 	pnpi = netdev_priv(pnetdev);
 
 	pnpi->priv = rtw_zvmalloc(sizeof_priv);
@@ -2435,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);
@@ -2558,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;