From 4c6d20160eaefb13fc855fe7d4384392d024d3a7 Mon Sep 17 00:00:00 2001
From: kimocoder <christian@aircrack-ng.org>
Date: Tue, 4 May 2021 14:07:31 +0200
Subject: [PATCH] Merge changes

---
 Makefile        | 52 ++++++++-----------------------------------------
 core/rtw_recv.c | 11 -----------
 2 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/Makefile b/Makefile
index 02c5549..23e762f 100755
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie
-EXTRA_CFLAGS += -O1
-#EXTRA_CFLAGS += -O3
-EXTRA_CFLAGS += -Wno-unused-variable
-EXTRA_CFLAGS += -Wno-unused-value
-EXTRA_CFLAGS += -Wno-unused-label
-EXTRA_CFLAGS += -Wno-unused-parameter
-EXTRA_CFLAGS += -Wno-unused-function
+#EXTRA_CFLAGS += -O1
+EXTRA_CFLAGS += -O3
+#EXTRA_CFLAGS += -Wno-unused-variable
+#EXTRA_CFLAGS += -Wno-unused-value
+#EXTRA_CFLAGS += -Wno-unused-label
+#EXTRA_CFLAGS += -Wno-unused-parameter
+#EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-unused
 EXTRA_CFLAGS += -Wno-vla
 EXTRA_CFLAGS += -Wno-date-time
@@ -21,11 +21,9 @@ EXTRA_CFLAGS += -Wno-date-time	# Fix compile error && warning on gcc 4.9 and lat
 endif
 
 EXTRA_CFLAGS += -I$(src)/include
-
 EXTRA_LDFLAGS += --strip-debug
 
 CONFIG_AUTOCFG_CP = n
-
 ########################## WIFI IC ############################
 CONFIG_MULTIDRV = n
 CONFIG_RTL8188E = y
@@ -164,9 +162,7 @@ CONFIG_PLATFORM_ARM_ODROIDC2 = n
 CONFIG_PLATFORM_PPC = n
 CONFIG_PLATFORM_PPC64LE = n
 ###############################################################
-
 CONFIG_DRVEXT_MODULE = n
-
 ########### COMMON  #################################
 ifeq ($(CONFIG_GSPI_HCI), y)
 HCI_NAME = gspi
@@ -184,7 +180,6 @@ ifeq ($(CONFIG_PCI_HCI), y)
 HCI_NAME = pci
 endif
 
-
 _OS_INTFS_FILES :=	os_dep/osdep_service.o \
 			os_dep/linux/os_intfs.o \
 			os_dep/linux/$(HCI_NAME)_intf.o \
@@ -214,7 +209,6 @@ _OS_INTFS_FILES += os_dep/linux/custom_gpio_linux.o
 _OS_INTFS_FILES += os_dep/linux/$(HCI_NAME)_ops_linux.o
 endif
 
-
 _HAL_INTFS_FILES :=	hal/hal_intf.o \
 			hal/hal_com.o \
 			hal/hal_com_phycfg.o \
@@ -293,7 +287,6 @@ endif
 ifeq ($(CONFIG_SDIO_HCI), y)
 _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188E_SDIO.o
 endif
-
 endif
 
 ########### HAL_RTL8192E #################################
@@ -353,7 +346,6 @@ ifeq ($(CONFIG_BT_COEXIST), y)
 _BTC_FILES += hal/btc/halbtc8192e1ant.o \
 				hal/btc/halbtc8192e2ant.o
 endif
-
 endif
 
 ########### HAL_RTL8812A_RTL8821A #################################
@@ -441,13 +433,11 @@ endif
 ifeq ($(CONFIG_SDIO_HCI), y)
 MODULE_NAME := 8821as
 endif
-
 endif
 
 EXTRA_CFLAGS += -DCONFIG_RTL8821A
 
-_HAL_INTFS_FILES +=	hal/rtl8812a/hal8821a_fw.o
-		
+_HAL_INTFS_FILES +=	hal/rtl8812a/hal8821a_fw.o	
 endif
 
 ifeq ($(CONFIG_BT_COEXIST), y)
@@ -460,7 +450,6 @@ _BTC_FILES += hal/btc/halbtc8821a1ant.o \
 				hal/btc/halbtc8821a2ant.o
 endif
 endif
-
 endif
 
 ########### HAL_RTL8723B #################################
@@ -518,7 +507,6 @@ ifeq ($(CONFIG_BT_COEXIST), y)
 _BTC_FILES += hal/btc/halbtc8723b1ant.o \
 				hal/btc/halbtc8723b2ant.o
 endif
-
 endif
 
 ########### HAL_RTL8814A #################################
@@ -576,7 +564,6 @@ endif
 ifeq ($(CONFIG_PCI_HCI), y)
 _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8814A_PCIE.o
 endif
-
 endif
 
 ########### HAL_RTL8723C #################################
@@ -632,7 +619,6 @@ endif
 ifeq ($(CONFIG_BT_COEXIST), y)
 _BTC_FILES += hal/btc/halbtc8703b1ant.o
 endif
-
 endif
 
 ########### HAL_RTL8723D #################################
@@ -691,7 +677,6 @@ ifeq ($(CONFIG_BT_COEXIST), y)
 _BTC_FILES += hal/btc/halbtc8723d1ant.o \
 				hal/btc/halbtc8723d2ant.o
 endif
-
 endif
 
 ########### HAL_RTL8188F #################################
@@ -741,7 +726,6 @@ endif
 ifeq ($(CONFIG_SDIO_HCI), y)
 _HAL_INTFS_FILES +=hal/efuse/$(RTL871X)/HalEfuseMask8188F_SDIO.o
 endif
-
 endif
 
 ########### HAL_RTL8822B #################################
@@ -760,7 +744,6 @@ endif
 ifeq ($(CONFIG_SDIO_HCI), y)
 MODULE_NAME = 88x2bs
 endif
-
 endif
 ########### HAL_RTL8821C #################################
 ifeq ($(CONFIG_RTL8821C), y)
@@ -774,7 +757,6 @@ endif
 ifeq ($(CONFIG_SDIO_HCI), y)
 MODULE_NAME = 8821cs
 endif
-
 endif
 ########### AUTO_CFG  #################################
 
@@ -793,7 +775,6 @@ else
 $(shell cp autoconf_$(RTL871X)_$(HCI_NAME)_linux.h include/autoconf.h)
 endif
 endif
-
 endif
 
 ########### END OF PATH  #################################
@@ -856,7 +837,6 @@ EXTRA_CFLAGS += -DWIFIMAC_PATH=\"$(USER_WIFIMAC_PATH)\"
 else
 EXTRA_CFLAGS += -DWIFIMAC_PATH=\"/data/wifimac.txt\"
 endif
-
 endif
 
 ifeq ($(CONFIG_EXT_CLK), y)
@@ -971,7 +951,6 @@ EXTRA_CFLAGS += -DCONFIG_BR_EXT
 EXTRA_CFLAGS += '-DCONFIG_BR_EXT_BRNAME="'$(BR_NAME)'"'
 endif
 
-
 ifeq ($(CONFIG_TDLS), y)
 EXTRA_CFLAGS += -DCONFIG_TDLS
 endif
@@ -1131,7 +1110,6 @@ EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
 EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
 
 ARCH ?= arm
-
 CROSS_COMPILE ?=
 KVER := $(shell uname -r)
 KSRC := /lib/modules/$(KVER)/build
@@ -1151,7 +1129,6 @@ KSRC := $(KERNEL_BUILD_PATH)
 MODULE_NAME :=wlan
 endif
 
-
 ifeq ($(CONFIG_PLATFORM_ACTIONS_ATM705X), y)
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
 #EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC
@@ -1368,8 +1345,6 @@ CROSS_COMPILE := /home/share/CusEnv/FreeScale/arm-eabi-4.4.3/bin/arm-eabi-
 KSRC ?= /home/share/CusEnv/FreeScale/FS_kernel_env
 endif
 
-
-
 ifeq ($(CONFIG_PLATFORM_ACTIONS_ATJ227X), y)
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ACTIONS_ATJ227X
 ARCH := mips
@@ -1733,7 +1708,6 @@ CONFIG_RTL8822BS ?= m
 USER_MODULE_NAME := rtl8822bs
 endif
 endif
-
 endif
 
 # Platform setting
@@ -1804,7 +1778,6 @@ _PLATFORM_FILES += platform/platform_ARM_SUNnI_sdio.o
 endif
 
 ARCH := arm
-
 # ==== Cross compile setting for Android 4.4 SDK =====
 #CROSS_COMPILE := arm-linux-gnueabihf-
 KVER  := 3.10.24
@@ -1812,7 +1785,6 @@ KVER  := 3.10.24
 CROSS_COMPILE := /home/realtek/software_phoenix/phoenix/toolchain/usr/local/arm-2013.11/bin/arm-linux-gnueabihf-
 KSRC := /home/realtek/software_phoenix/linux-kernel
 MODULE_NAME := 8192eu
-
 endif
 
 ifeq ($(CONFIG_PLATFORM_RTK129X), y)
@@ -1841,7 +1813,6 @@ EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
 endif
 
 ARCH := arm64
-
 # ==== Cross compile setting for Android 4.4 SDK =====
 #CROSS_COMPILE := arm-linux-gnueabihf-
 #KVER  := 4.1.10
@@ -1861,10 +1832,8 @@ EXTRA_CFLAGS += -DCONFIG_USE_USB_BUFFER_ALLOC_TX
 endif
 
 ARCH:=rlx
-
 CROSS_COMPILE:=mips-linux-
 KSRC:= /home/realtek/share/Develop/IPCAM_SDK/RealSil/rts3901_sdk_v1.2_vanilla/linux-3.10
-
 endif
 
 ifeq ($(CONFIG_PLATFORM_NOVATEK_NT72668), y)
@@ -1929,7 +1898,6 @@ CONFIG_RTL8822BS ?= m
 USER_MODULE_NAME := 8822bs
 endif
 endif
-
 endif
 
 ifeq ($(CONFIG_PLATFORM_ZTE_ZX296716), y)
@@ -1959,11 +1927,9 @@ CONFIG_RTL8822BS ?= m
 USER_MODULE_NAME := 8822bs
 endif
 endif
-
 endif
 
 ifeq ($(CONFIG_MULTIDRV), y)
-
 ifeq ($(CONFIG_SDIO_HCI), y)
 MODULE_NAME := rtw_sdio
 endif
@@ -1975,8 +1941,6 @@ endif
 ifeq ($(CONFIG_PCI_HCI), y)
 MODULE_NAME := rtw_pci
 endif
-
-
 endif
 
 USER_MODULE_NAME ?=
diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index 6563119..7c438ce 100644
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -2008,7 +2008,6 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
 		psa = get_sa(ptr);
 		pbssid = get_hdr_bssid(ptr);
 
-
 		_rtw_memcpy(pattrib->dst, pda, ETH_ALEN);
 		_rtw_memcpy(pattrib->src, psa, ETH_ALEN);
 
@@ -2123,7 +2122,6 @@ pre_validate_status_chk:
 	} else if (ret == RTW_RX_HANDLED)
 		goto exit;
 
-
 	if (psta == NULL) {
 		#ifdef DBG_RX_DROP_FRAME
 		RTW_INFO("DBG_RX_DROP_FRAME "FUNC_ADPT_FMT" psta == NULL, ra="MAC_FMT", ta="MAC_FMT"\n"
@@ -2151,7 +2149,6 @@ pre_validate_status_chk:
 		pattrib->hdrlen = WLAN_HDR_A3_LEN + a4_shift;
 	}
 
-
 	if (pattrib->order) /* HT-CTRL 11n */
 		pattrib->hdrlen += 4;
 
@@ -2263,7 +2260,6 @@ sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
 	u8	external_len = 0;
 #endif
 
-
 #ifdef CONFIG_FIND_BEST_CHANNEL
 	if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
 		int ch_set_idx = rtw_chset_search_ch(rfctl->channel_set, rtw_get_oper_ch(adapter));
@@ -2374,7 +2370,6 @@ sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
 				break;
 			}
 		}
-
 #endif
 
 		pattrib->qos = (subtype & BIT(7)) ? 1 : 0;
@@ -2411,12 +2406,9 @@ sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
 	}
 
 exit:
-
-
 	return retval;
 }
 
-
 /* remove the wlanhdr and add the eth_hdr */
 #if 1
 sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
@@ -2434,7 +2426,6 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
 	u8	*ptr = get_recvframe_data(precvframe) ; /* point to frame_ctrl field */
 	struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib;
 
-
 	if (pattrib->encrypt)
 		recvframe_pull_tail(precvframe, pattrib->icv_len);
 
@@ -2457,12 +2448,10 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
 	rmv_len = pattrib->hdrlen + pattrib->iv_len + RATTRIB_GET_MCTRL_LEN(pattrib) + (bsnaphdr ? SNAP_SIZE : 0);
 	len = precvframe->u.hdr.len - rmv_len;
 
-
 	_rtw_memcpy(&eth_type, ptr + rmv_len, 2);
 	eth_type = ntohs((unsigned short)eth_type); /* pattrib->ether_type */
 	pattrib->eth_type = eth_type;
 
-
 	if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE)) {
 		ptr += rmv_len ;
 		*ptr = 0x87;