Compare commits
No commits in common. "kali/master" and "debian/5.3.9_20191129-0kali1" have entirely different histories.
kali/maste
...
debian/5.3
|
|
@ -1,46 +0,0 @@
|
||||||
## Build Kernel Headers
|
|
||||||
|
|
||||||
```
|
|
||||||
cd [your kernel source directory]
|
|
||||||
make module_prepare
|
|
||||||
make modules_install INSTALL_MOD_PATH=../
|
|
||||||
```
|
|
||||||
|
|
||||||
## Build RTL8188EUS driver/modules
|
|
||||||
|
|
||||||
```
|
|
||||||
cd ../
|
|
||||||
git clone https://github.com/aircrack-ng/rtl8188eus -b v5.3.9
|
|
||||||
cd rtl8188eus
|
|
||||||
```
|
|
||||||
|
|
||||||
That command places this driver behind your kernel source directory (RECOMMENDED).
|
|
||||||
If you put it anywhere you might need to set the Makefile in this driver, but i won't explain it.
|
|
||||||
Now, do:
|
|
||||||
|
|
||||||
```
|
|
||||||
export ARCH=arm64
|
|
||||||
export SUBARCH=arm64
|
|
||||||
export CROSS_COMPILE=../toolchain/toolchain64/bin/aarch64-linux-android-
|
|
||||||
export KBUILD_KVER=3.10.73-NetHunter-something
|
|
||||||
```
|
|
||||||
|
|
||||||
arm64 is the device architecture.
|
|
||||||
CROSS_COMPILE is your toolchain directory.
|
|
||||||
KBUILD_KVER is your kernel build version, you can search for it in ../lib/modules (the place of your modules_install when you build kernel headers).
|
|
||||||
|
|
||||||
Now, do:
|
|
||||||
```
|
|
||||||
make
|
|
||||||
```
|
|
||||||
|
|
||||||
If there is no error or success you will see a file named 8188eu.ko in this driver directory.
|
|
||||||
|
|
||||||
|
|
||||||
## Load the driver (8188eu.ko)
|
|
||||||
```
|
|
||||||
su
|
|
||||||
cd /system/lib/modules
|
|
||||||
insmod 8188eu.ko
|
|
||||||
```
|
|
||||||
|
|
||||||
4
Kconfig
4
Kconfig
|
|
@ -1,6 +1,6 @@
|
||||||
config RTL8188EU
|
config RTL8188EUS
|
||||||
tristate "Realtek 8188E USB WiFi"
|
tristate "Realtek 8188E USB WiFi"
|
||||||
depends on USB
|
depends on USB
|
||||||
---help---
|
---help---
|
||||||
Help message of RTL8188EU
|
Help message of RTL8188EUS
|
||||||
|
|
||||||
|
|
|
||||||
62
Makefile
62
Makefile
|
|
@ -1,28 +1,37 @@
|
||||||
EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie
|
EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) -fno-pie
|
||||||
EXTRA_CFLAGS += -O1
|
EXTRA_CFLAGS += -O1
|
||||||
#EXTRA_CFLAGS += -O3
|
#EXTRA_CFLAGS += -O3
|
||||||
|
#EXTRA_CFLAGS += -Wall
|
||||||
|
#EXTRA_CFLAGS += -Wextra
|
||||||
|
#EXTRA_CFLAGS += -Werror
|
||||||
|
#EXTRA_CFLAGS += -pedantic
|
||||||
|
#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes
|
||||||
|
|
||||||
EXTRA_CFLAGS += -Wno-unused-variable
|
EXTRA_CFLAGS += -Wno-unused-variable
|
||||||
EXTRA_CFLAGS += -Wno-unused-value
|
EXTRA_CFLAGS += -Wno-unused-value
|
||||||
EXTRA_CFLAGS += -Wno-unused-label
|
EXTRA_CFLAGS += -Wno-unused-label
|
||||||
EXTRA_CFLAGS += -Wno-unused-parameter
|
EXTRA_CFLAGS += -Wno-unused-parameter
|
||||||
EXTRA_CFLAGS += -Wno-unused-function
|
EXTRA_CFLAGS += -Wno-unused-function
|
||||||
EXTRA_CFLAGS += -Wno-unused
|
EXTRA_CFLAGS += -Wno-unused
|
||||||
EXTRA_CFLAGS += -Wno-address
|
#EXTRA_CFLAGS += -Wno-uninitialized
|
||||||
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-vla
|
||||||
|
#EXTRA_CFLAGS += -Wno-cast-function-type
|
||||||
EXTRA_CFLAGS += -Wno-date-time
|
EXTRA_CFLAGS += -Wno-date-time
|
||||||
|
#EXTRA_CFLAGS += -Wno-misleading-indentation
|
||||||
|
#EXTRA_CFLAGS += -Wno-uninitialized
|
||||||
|
# Relax some warnings from '-Wextra' so we won't get flooded with warnings
|
||||||
|
#EXTRA_CFLAGS += -Wno-sign-compare
|
||||||
|
#EXTRA_CFLAGS += -Wno-missing-field-initializers
|
||||||
|
#EXTRA_CFLAGS += -Wno-type-limits
|
||||||
|
EXTRA_CFLAGS += -Wno-implicit-fallthrough
|
||||||
|
EXTRA_CFLAGS += -Wno-maybe-uninitialized
|
||||||
|
|
||||||
GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
|
GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
|
||||||
ifeq ($(GCC_VER_49),1)
|
ifeq ($(GCC_VER_49),1)
|
||||||
EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later
|
EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_CFLAGS += -I$(src)/include -I$(srctree)/$(src)/include
|
EXTRA_CFLAGS += -I$(src)/include
|
||||||
|
|
||||||
EXTRA_LDFLAGS += --strip-debug
|
EXTRA_LDFLAGS += --strip-debug
|
||||||
|
|
||||||
|
|
@ -47,7 +56,7 @@ CONFIG_PCI_HCI = n
|
||||||
CONFIG_SDIO_HCI = n
|
CONFIG_SDIO_HCI = n
|
||||||
CONFIG_GSPI_HCI = n
|
CONFIG_GSPI_HCI = n
|
||||||
########################## Features ###########################
|
########################## Features ###########################
|
||||||
CONFIG_NET_NS = y
|
CONFIG_NET_NS = n
|
||||||
CONFIG_MP_INCLUDED = y
|
CONFIG_MP_INCLUDED = y
|
||||||
CONFIG_POWER_SAVING = n
|
CONFIG_POWER_SAVING = n
|
||||||
CONFIG_USB_AUTOSUSPEND = n
|
CONFIG_USB_AUTOSUSPEND = n
|
||||||
|
|
@ -80,10 +89,10 @@ CONFIG_RTW_IPCAM_APPLICATION = n
|
||||||
CONFIG_RTW_REPEATER_SON = n
|
CONFIG_RTW_REPEATER_SON = n
|
||||||
CONFIG_RTW_WIFI_HAL = y
|
CONFIG_RTW_WIFI_HAL = y
|
||||||
########################## Debug ###########################
|
########################## Debug ###########################
|
||||||
CONFIG_RTW_DEBUG = n
|
CONFIG_RTW_DEBUG = y
|
||||||
# default log level is _DRV_INFO_ = 4,
|
# default log level is _DRV_INFO_ = 4,
|
||||||
# please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
|
# please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
|
||||||
CONFIG_RTW_LOG_LEVEL = 0
|
CONFIG_RTW_LOG_LEVEL = 4
|
||||||
######################## Wake On Lan ##########################
|
######################## Wake On Lan ##########################
|
||||||
CONFIG_WOWLAN = n
|
CONFIG_WOWLAN = n
|
||||||
CONFIG_WAKEUP_TYPE = 0x7 #bit2: deauth, bit1: unicast, bit0: magic pkt.
|
CONFIG_WAKEUP_TYPE = 0x7 #bit2: deauth, bit1: unicast, bit0: magic pkt.
|
||||||
|
|
@ -161,11 +170,12 @@ CONFIG_PLATFORM_AML_S905 = n
|
||||||
CONFIG_PLATFORM_ZTE_ZX296716 = n
|
CONFIG_PLATFORM_ZTE_ZX296716 = n
|
||||||
CONFIG_PLATFORM_ARM_ODROIDC2 = n
|
CONFIG_PLATFORM_ARM_ODROIDC2 = n
|
||||||
CONFIG_PLATFORM_PPC = n
|
CONFIG_PLATFORM_PPC = n
|
||||||
CONFIG_PLATFORM_PPC64LE = n
|
|
||||||
###############################################################
|
###############################################################
|
||||||
|
|
||||||
CONFIG_DRVEXT_MODULE = n
|
CONFIG_DRVEXT_MODULE = n
|
||||||
|
|
||||||
|
export TopDIR ?= $(shell pwd)
|
||||||
|
|
||||||
########### COMMON #################################
|
########### COMMON #################################
|
||||||
ifeq ($(CONFIG_GSPI_HCI), y)
|
ifeq ($(CONFIG_GSPI_HCI), y)
|
||||||
HCI_NAME = gspi
|
HCI_NAME = gspi
|
||||||
|
|
@ -229,11 +239,10 @@ _HAL_INTFS_FILES := hal/hal_intf.o \
|
||||||
hal/led/hal_$(HCI_NAME)_led.o
|
hal/led/hal_$(HCI_NAME)_led.o
|
||||||
|
|
||||||
|
|
||||||
EXTRA_CFLAGS += -I$(src)/platform -I$(srctree)/$(src)/platform
|
EXTRA_CFLAGS += -I$(src)/platform
|
||||||
_PLATFORM_FILES := platform/platform_ops.o
|
_PLATFORM_FILES := platform/platform_ops.o
|
||||||
|
|
||||||
EXTRA_CFLAGS += -I$(src)/hal/btc -I$(srctree)/$(src)/hal/btc
|
EXTRA_CFLAGS += -I$(src)/hal/btc
|
||||||
EXTRA_CFLAGS += -I$(src)/hal/phydm -I$(srctree)/$(src)/hal/phydm
|
|
||||||
|
|
||||||
########### HAL_RTL8188E #################################
|
########### HAL_RTL8188E #################################
|
||||||
ifeq ($(CONFIG_RTL8188E), y)
|
ifeq ($(CONFIG_RTL8188E), y)
|
||||||
|
|
@ -781,16 +790,16 @@ endif
|
||||||
ifeq ($(CONFIG_AUTOCFG_CP), y)
|
ifeq ($(CONFIG_AUTOCFG_CP), y)
|
||||||
|
|
||||||
ifeq ($(CONFIG_MULTIDRV), y)
|
ifeq ($(CONFIG_MULTIDRV), y)
|
||||||
$(shell cp autoconf_multidrv_$(HCI_NAME)_linux.h include/autoconf.h)
|
$(shell cp $(TopDIR)/autoconf_multidrv_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_RTL8188E)$(CONFIG_SDIO_HCI),yy)
|
ifeq ($(CONFIG_RTL8188E)$(CONFIG_SDIO_HCI),yy)
|
||||||
$(shell cp autoconf_rtl8189e_$(HCI_NAME)_linux.h include/autoconf.h)
|
$(shell cp $(TopDIR)/autoconf_rtl8189e_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
|
||||||
else ifeq ($(CONFIG_RTL8188F)$(CONFIG_SDIO_HCI),yy)
|
else ifeq ($(CONFIG_RTL8188F)$(CONFIG_SDIO_HCI),yy)
|
||||||
$(shell cp autoconf_rtl8189f_$(HCI_NAME)_linux.h include/autoconf.h)
|
$(shell cp $(TopDIR)/autoconf_rtl8189f_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
|
||||||
else ifeq ($(CONFIG_RTL8723C),y)
|
else ifeq ($(CONFIG_RTL8723C),y)
|
||||||
$(shell cp autoconf_rtl8723c_$(HCI_NAME)_linux.h include/autoconf.h)
|
$(shell cp $(TopDIR)/autoconf_rtl8723c_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
|
||||||
else
|
else
|
||||||
$(shell cp autoconf_$(RTL871X)_$(HCI_NAME)_linux.h include/autoconf.h)
|
$(shell cp $(TopDIR)/autoconf_$(RTL871X)_$(HCI_NAME)_linux.h $(TopDIR)/include/autoconf.h)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
@ -1038,7 +1047,7 @@ EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04
|
||||||
ifeq ($(CONFIG_PLATFORM_I386_PC), y)
|
ifeq ($(CONFIG_PLATFORM_I386_PC), y)
|
||||||
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
||||||
EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
|
EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
|
||||||
SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc64le/powerpc/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/;")
|
SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/;")
|
||||||
ARCH ?= $(SUBARCH)
|
ARCH ?= $(SUBARCH)
|
||||||
CROSS_COMPILE ?=
|
CROSS_COMPILE ?=
|
||||||
KVER := $(shell uname -r)
|
KVER := $(shell uname -r)
|
||||||
|
|
@ -1092,17 +1101,6 @@ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
|
||||||
INSTALL_PREFIX :=
|
INSTALL_PREFIX :=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_PLATFORM_PPC64LE), y)
|
|
||||||
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
|
||||||
SUBARCH := $(shell uname -m | sed -e s/ppc64le/powerpc/)
|
|
||||||
ARCH ?= $(SUBARCH)
|
|
||||||
CROSS_COMPILE ?=
|
|
||||||
KVER ?= $(shell uname -r)
|
|
||||||
KSRC := /lib/modules/$(KVER)/build
|
|
||||||
MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
|
|
||||||
INSTALL_PREFIX :=
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_PLATFORM_NV_TK1), y)
|
ifeq ($(CONFIG_PLATFORM_NV_TK1), y)
|
||||||
EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1
|
EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1
|
||||||
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
|
||||||
|
|
|
||||||
58
README.md
58
README.md
|
|
@ -5,55 +5,46 @@
|
||||||
[](#)
|
[](#)
|
||||||
[](#)
|
[](#)
|
||||||
[](#)
|
[](#)
|
||||||
[](https://github.com/aircrack-ng/rtl8188eus/issues)
|
[](https://github.com/kimocoder/rtl8188eus/issues)
|
||||||
[](https://github.com/aircrack-ng/rtl8188eus/network)
|
[](https://github.com/kimocoder/rtl8188eus/network)
|
||||||
[](https://github.com/aircrack-ng/rtl8188eus/stargazers)
|
[](https://github.com/kimocoder/rtl8188eus/stargazers)
|
||||||
[](https://github.com/aircrack-ng/rtl8188eus/blob/master/LICENSE)<br>
|
[](https://github.com/kimocoder/rtl8188eus/blob/master/LICENSE)<br>
|
||||||
[-supported-brightgreen.svg)](#)
|
[-supported-brightgreen.svg)](#)
|
||||||
[](#)
|
[](#)
|
||||||
|
|
||||||
|
This is a pure Realtek release, not from vendor but from all the Realtek multichip "bases"
|
||||||
|
we've seen, this must be the newest, most stable and effective one.
|
||||||
|
The performance and code quality has been improved.
|
||||||
|
|
||||||
# Supports
|
# Supports
|
||||||
* Android 12/13
|
|
||||||
* MESH Support
|
* MESH Support
|
||||||
* Monitor mode
|
* Monitor mode
|
||||||
* Frame injection
|
* Frame injection
|
||||||
* Up to kernel v6.5+
|
* Up to kernel v5.3+
|
||||||
... And a bunch of various wifi chipsets
|
... And a bunch of various wifi chipsets
|
||||||
|
|
||||||
# Howto build/install
|
# 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.ko" > "/etc/modprobe.d/realtek.conf"
|
||||||
cd rtl8188eus
|
3. "make && make install"<br>
|
||||||
make && sudo make install
|
4. Reboot in order to blacklist and load the new driver/module.
|
||||||
```
|
|
||||||
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
|
# MONITOR MODE howto
|
||||||
Use these steps to enter monitor mode.
|
Use these steps to enter monitor mode.
|
||||||
```
|
```
|
||||||
sudo airmon-ng check kill
|
airmon-ng check-kill
|
||||||
sudo ip link set <interface> down
|
ip link set <interface> down
|
||||||
sudo iw dev <interface> set type monitor
|
iw dev <interface> set type monitor
|
||||||
```
|
```
|
||||||
Frame injection test may be performed with
|
Frame injection test may be performed with
|
||||||
(after kernel v5.2 scanning is slow, run a scan or simply an airodump-ng first!)
|
(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
|
# NetworkManager configuration
|
||||||
Add these lines below to "NetworkManager.conf" and ADD YOUR ADAPTER MAC below [keyfile]
|
Add these lines below to "NetworkManager.conf" and ADD YOUR ADAPTER MAC below [keyfile]
|
||||||
This will make the Network-Manager ignore the device, and therefore don't cause problems.
|
This will make the Network-Manager ignore the device, and therefor don't cause problems.
|
||||||
```
|
```
|
||||||
[device]
|
[device]
|
||||||
wifi.scan-rand-mac-address=no
|
wifi.scan-rand-mac-address=no
|
||||||
|
|
@ -71,9 +62,12 @@ plugins=keyfile
|
||||||
unmanaged-devices=mac:A7:A7:A7:A7:A7
|
unmanaged-devices=mac:A7:A7:A7:A7:A7
|
||||||
```
|
```
|
||||||
|
|
||||||
# Credits
|
# TODO
|
||||||
Realtek - https://www.realtek.com<br>
|
* Implement txpower control
|
||||||
Alfa Networks - https://www.alfa.com.tw<br>
|
|
||||||
aircrack-ng. - https://www.aircrack-ng.org<br>
|
* Finish up the elimination of the wrapper _rtw_memset.
|
||||||
<br>
|
I didn't have more time after "rtw_beamforming.c"
|
||||||
And all those who may be using or contributing to it of anykind. Thanks!<br>
|
|
||||||
|
* Add more VID/PIDS for all 3 chipsets supported.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -711,14 +711,13 @@ void rtw_efuse_analyze(PADAPTER padapter, u8 Type, u8 Fake)
|
||||||
j = 0;
|
j = 0;
|
||||||
|
|
||||||
for (i = 0; i < mapLen; i++) {
|
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, "0x%03x: ", i);
|
||||||
_RTW_PRINT_SEL(RTW_DBGDUMP, "%02X%s"
|
_RTW_PRINT_SEL(RTW_DBGDUMP, "%02X%s"
|
||||||
, pEfuseHal->fakeEfuseInitMap[i]
|
, pEfuseHal->fakeEfuseInitMap[i]
|
||||||
, ((i + 1) % 16 == 0) ? "\n" : (((i + 1) % 8 == 0) ? " " : " ")
|
, ((i + 1) % 16 == 0) ? "\n" : (((i + 1) % 8 == 0) ? " " : " ")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
_RTW_PRINT_SEL(RTW_DBGDUMP, "\n");
|
_RTW_PRINT_SEL(RTW_DBGDUMP, "\n");
|
||||||
if (eFuseWord)
|
if (eFuseWord)
|
||||||
rtw_mfree((u8 *)eFuseWord, EFUSE_MAX_SECTION_NUM * (EFUSE_MAX_WORD_UNIT * 2));
|
rtw_mfree((u8 *)eFuseWord, EFUSE_MAX_SECTION_NUM * (EFUSE_MAX_WORD_UNIT * 2));
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,9 @@
|
||||||
#define _RTW_BR_EXT_C_
|
#define _RTW_BR_EXT_C_
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
#include <linux/version.h>
|
|
||||||
#include <linux/if_arp.h>
|
#include <linux/if_arp.h>
|
||||||
#include <net/ip.h>
|
#include <net/ip.h>
|
||||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
|
|
||||||
#include <net/ipx.h>
|
#include <net/ipx.h>
|
||||||
#endif
|
|
||||||
#include <linux/atalk.h>
|
#include <linux/atalk.h>
|
||||||
#include <linux/udp.h>
|
#include <linux/udp.h>
|
||||||
#include <linux/if_pppox.h>
|
#include <linux/if_pppox.h>
|
||||||
|
|
@ -117,13 +114,7 @@ static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_ta
|
||||||
/* have a room for new tag */
|
/* have a room for new tag */
|
||||||
memmove(((unsigned char *)ph->tag + data_len), (unsigned char *)ph->tag, ntohs(ph->length));
|
memmove(((unsigned char *)ph->tag + data_len), (unsigned char *)ph->tag, ntohs(ph->length));
|
||||||
ph->length = htons(ntohs(ph->length) + data_len);
|
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);
|
memcpy((unsigned char *)ph->tag, tag, data_len);
|
||||||
#if (defined __GNUC__) && (__GNUC__ > 10)
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
return data_len;
|
return data_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -957,7 +948,6 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
|
|
||||||
/* IPX */
|
/* IPX */
|
||||||
if (ipx != NULL) {
|
if (ipx != NULL) {
|
||||||
switch (method) {
|
switch (method) {
|
||||||
|
|
@ -1026,12 +1016,8 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* AARP */
|
/* AARP */
|
||||||
else if (ea != NULL) {
|
else if (ea != NULL) {
|
||||||
#else
|
|
||||||
if (ea != NULL) {
|
|
||||||
#endif
|
|
||||||
/* Sanity check fields. */
|
/* Sanity check fields. */
|
||||||
if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
|
if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
|
||||||
DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
|
DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
|
||||||
|
|
|
||||||
|
|
@ -6051,7 +6051,6 @@ ssize_t proc_set_lck(struct file *file, const char __user *buffer, size_t count,
|
||||||
inline void RTW_BUF_DUMP_SEL(uint _loglevel, void *sel, u8 *_titlestring,
|
inline void RTW_BUF_DUMP_SEL(uint _loglevel, void *sel, u8 *_titlestring,
|
||||||
bool _idx_show, const u8 *_hexdata, int _hexdatalen)
|
bool _idx_show, const u8 *_hexdata, int _hexdatalen)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_RTW_DEBUG
|
|
||||||
int __i;
|
int __i;
|
||||||
u8 *ptr = (u8 *)_hexdata;
|
u8 *ptr = (u8 *)_hexdata;
|
||||||
|
|
||||||
|
|
@ -6077,7 +6076,6 @@ inline void RTW_BUF_DUMP_SEL(uint _loglevel, void *sel, u8 *_titlestring,
|
||||||
}
|
}
|
||||||
_RTW_PRINT_SEL(sel, "\n");
|
_RTW_PRINT_SEL(sel, "\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
inline void _RTW_STR_DUMP_SEL(void *sel, char *str_out)
|
inline void _RTW_STR_DUMP_SEL(void *sel, char *str_out)
|
||||||
|
|
|
||||||
|
|
@ -1831,13 +1831,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
|
||||||
ptable->func = &OnAuth;
|
ptable->func = &OnAuth;
|
||||||
else
|
else
|
||||||
ptable->func = &OnAuthClient;
|
ptable->func = &OnAuthClient;
|
||||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
/* pass through */
|
||||||
//#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
|
|
||||||
// __attribute__ ((fallthrough));
|
|
||||||
//#else
|
|
||||||
// __attribute__ ((fallthrough));
|
|
||||||
//#endif
|
|
||||||
break;
|
|
||||||
case WIFI_ASSOCREQ:
|
case WIFI_ASSOCREQ:
|
||||||
case WIFI_REASSOCREQ:
|
case WIFI_REASSOCREQ:
|
||||||
_mgt_dispatcher(padapter, ptable, precv_frame);
|
_mgt_dispatcher(padapter, ptable, precv_frame);
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,9 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
#define _RTW_MP_C_
|
#define _RTW_MP_C_
|
||||||
#include <drv_types.h>
|
#include <drv_types.h>
|
||||||
|
#ifdef PLATFORM_FREEBSD
|
||||||
|
#include <sys/unistd.h> /* for RFHIGHPID */
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "../hal/phydm/phydm_precomp.h"
|
#include "../hal/phydm/phydm_precomp.h"
|
||||||
#if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8821A)
|
#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
|
#ifdef PLATFORM_LINUX
|
||||||
static int init_mp_priv_by_os(struct mp_priv *pmp_priv)
|
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;
|
pmp_priv->tx.PktTxThread = NULL;
|
||||||
}
|
}
|
||||||
#endif
|
#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);
|
Rtw_MPSetMacTxEDCA(padapter);
|
||||||
exit:
|
exit:
|
||||||
|
|
|
||||||
|
|
@ -982,6 +982,13 @@ static void next_key(u8 *key, sint round);
|
||||||
static void byte_sub(u8 *in, u8 *out);
|
static void byte_sub(u8 *in, u8 *out);
|
||||||
static void shift_row(u8 *in, u8 *out);
|
static void shift_row(u8 *in, u8 *out);
|
||||||
static void mix_column(u8 *in, u8 *out);
|
static void mix_column(u8 *in, u8 *out);
|
||||||
|
#ifndef PLATFORM_FREEBSD
|
||||||
|
static void add_round_key(u8 *shiftrow_in,
|
||||||
|
u8 *mcol_in,
|
||||||
|
u8 *block_in,
|
||||||
|
sint round,
|
||||||
|
u8 *out);
|
||||||
|
#endif /* PLATFORM_FREEBSD */
|
||||||
static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext);
|
static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1575,7 +1582,7 @@ u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe)
|
||||||
pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
|
pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
|
||||||
|
|
||||||
/* 4 start to encrypt each fragment */
|
/* 4 start to encrypt each fragment */
|
||||||
if (pattrib->encrypt == _AES_) {
|
if ((pattrib->encrypt == _AES_)) {
|
||||||
/*
|
/*
|
||||||
if(pattrib->psta)
|
if(pattrib->psta)
|
||||||
{
|
{
|
||||||
|
|
@ -1922,6 +1929,7 @@ u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe)
|
||||||
|
|
||||||
|
|
||||||
sint length;
|
sint length;
|
||||||
|
u32 prwskeylen;
|
||||||
u8 *pframe, *prwskey; /* , *payload,*iv */
|
u8 *pframe, *prwskey; /* , *payload,*iv */
|
||||||
struct sta_info *stainfo;
|
struct sta_info *stainfo;
|
||||||
struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
|
struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
|
||||||
|
|
@ -1930,7 +1938,7 @@ u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe)
|
||||||
u32 res = _SUCCESS;
|
u32 res = _SUCCESS;
|
||||||
pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
|
pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data;
|
||||||
/* 4 start to encrypt each fragment */
|
/* 4 start to encrypt each fragment */
|
||||||
if (prxattrib->encrypt == _AES_) {
|
if ((prxattrib->encrypt == _AES_)) {
|
||||||
|
|
||||||
stainfo = rtw_get_stainfo(&padapter->stapriv , &prxattrib->ta[0]);
|
stainfo = rtw_get_stainfo(&padapter->stapriv , &prxattrib->ta[0]);
|
||||||
if (stainfo != NULL) {
|
if (stainfo != NULL) {
|
||||||
|
|
@ -2131,9 +2139,8 @@ BIP_exit:
|
||||||
#endif /* CONFIG_IEEE80211W */
|
#endif /* CONFIG_IEEE80211W */
|
||||||
|
|
||||||
#ifndef PLATFORM_FREEBSD
|
#ifndef PLATFORM_FREEBSD
|
||||||
#if defined(CONFIG_TDLS)
|
|
||||||
/* compress 512-bits */
|
/* compress 512-bits */
|
||||||
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 S[8], W[64], t0, t1;
|
||||||
u32 t;
|
u32 t;
|
||||||
|
|
@ -2181,7 +2188,7 @@ static int rtw_sha256_compress(struct rtw_sha256_state *md, unsigned char *buf)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize the hash state */
|
/* Initialize the hash state */
|
||||||
static void rtw_sha256_init(struct rtw_sha256_state *md)
|
static void sha256_init(struct sha256_state *md)
|
||||||
{
|
{
|
||||||
md->curlen = 0;
|
md->curlen = 0;
|
||||||
md->length = 0;
|
md->length = 0;
|
||||||
|
|
@ -2202,7 +2209,7 @@ static void rtw_sha256_init(struct rtw_sha256_state *md)
|
||||||
@param inlen The length of the data (octets)
|
@param inlen The length of the data (octets)
|
||||||
@return CRYPT_OK if successful
|
@return CRYPT_OK if successful
|
||||||
*/
|
*/
|
||||||
static int rtw_sha256_process(struct rtw_sha256_state *md, unsigned char *in,
|
static int sha256_process(struct sha256_state *md, unsigned char *in,
|
||||||
unsigned long inlen)
|
unsigned long inlen)
|
||||||
{
|
{
|
||||||
unsigned long n;
|
unsigned long n;
|
||||||
|
|
@ -2213,7 +2220,7 @@ static int rtw_sha256_process(struct rtw_sha256_state *md, unsigned char *in,
|
||||||
|
|
||||||
while (inlen > 0) {
|
while (inlen > 0) {
|
||||||
if (md->curlen == 0 && inlen >= block_size) {
|
if (md->curlen == 0 && inlen >= block_size) {
|
||||||
if (rtw_sha256_compress(md, (unsigned char *) in) < 0)
|
if (sha256_compress(md, (unsigned char *) in) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
md->length += block_size * 8;
|
md->length += block_size * 8;
|
||||||
in += block_size;
|
in += block_size;
|
||||||
|
|
@ -2225,7 +2232,7 @@ static int rtw_sha256_process(struct rtw_sha256_state *md, unsigned char *in,
|
||||||
in += n;
|
in += n;
|
||||||
inlen -= n;
|
inlen -= n;
|
||||||
if (md->curlen == block_size) {
|
if (md->curlen == block_size) {
|
||||||
if (rtw_sha256_compress(md, md->buf) < 0)
|
if (sha256_compress(md, md->buf) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
md->length += 8 * block_size;
|
md->length += 8 * block_size;
|
||||||
md->curlen = 0;
|
md->curlen = 0;
|
||||||
|
|
@ -2243,7 +2250,7 @@ static int rtw_sha256_process(struct rtw_sha256_state *md, unsigned char *in,
|
||||||
@param out [out] The destination of the hash (32 bytes)
|
@param out [out] The destination of the hash (32 bytes)
|
||||||
@return CRYPT_OK if successful
|
@return CRYPT_OK if successful
|
||||||
*/
|
*/
|
||||||
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;
|
int i;
|
||||||
|
|
||||||
|
|
@ -2263,7 +2270,7 @@ static int rtw_sha256_done(struct rtw_sha256_state *md, unsigned char *out)
|
||||||
if (md->curlen > 56) {
|
if (md->curlen > 56) {
|
||||||
while (md->curlen < 64)
|
while (md->curlen < 64)
|
||||||
md->buf[md->curlen++] = (unsigned char) 0;
|
md->buf[md->curlen++] = (unsigned char) 0;
|
||||||
rtw_sha256_compress(md, md->buf);
|
sha256_compress(md, md->buf);
|
||||||
md->curlen = 0;
|
md->curlen = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2273,7 +2280,7 @@ static int rtw_sha256_done(struct rtw_sha256_state *md, unsigned char *out)
|
||||||
|
|
||||||
/* store length */
|
/* store length */
|
||||||
WPA_PUT_BE64(md->buf + 56, md->length);
|
WPA_PUT_BE64(md->buf + 56, md->length);
|
||||||
rtw_sha256_compress(md, md->buf);
|
sha256_compress(md, md->buf);
|
||||||
|
|
||||||
/* copy output */
|
/* copy output */
|
||||||
for (i = 0; i < 8; i++)
|
for (i = 0; i < 8; i++)
|
||||||
|
|
@ -2290,17 +2297,17 @@ static int rtw_sha256_done(struct rtw_sha256_state *md, unsigned char *out)
|
||||||
* @mac: Buffer for the hash
|
* @mac: Buffer for the hash
|
||||||
* Returns: 0 on success, -1 of failure
|
* Returns: 0 on success, -1 of failure
|
||||||
*/
|
*/
|
||||||
static int rtw_sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
|
static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
|
||||||
u8 *mac)
|
u8 *mac)
|
||||||
{
|
{
|
||||||
struct rtw_sha256_state ctx;
|
struct sha256_state ctx;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
rtw_sha256_init(&ctx);
|
sha256_init(&ctx);
|
||||||
for (i = 0; i < num_elem; i++)
|
for (i = 0; i < num_elem; i++)
|
||||||
if (rtw_sha256_process(&ctx, addr[i], len[i]))
|
if (sha256_process(&ctx, addr[i], len[i]))
|
||||||
return -1;
|
return -1;
|
||||||
if (rtw_sha256_done(&ctx, mac))
|
if (sha256_done(&ctx, mac))
|
||||||
return -1;
|
return -1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -2312,9 +2319,7 @@ static u8 os_strlen(const char *s)
|
||||||
p++;
|
p++;
|
||||||
return p - s;
|
return p - s;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_TDLS) || defined(CONFIG_RTW_MESH_AEK)
|
|
||||||
static int os_memcmp(const void *s1, const void *s2, u8 n)
|
static int os_memcmp(const void *s1, const void *s2, u8 n)
|
||||||
{
|
{
|
||||||
const unsigned char *p1 = s1, *p2 = s2;
|
const unsigned char *p1 = s1, *p2 = s2;
|
||||||
|
|
@ -2332,7 +2337,6 @@ static int os_memcmp(const void *s1, const void *s2, u8 n)
|
||||||
|
|
||||||
return *p1 - *p2;
|
return *p1 - *p2;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* hmac_sha256_vector - HMAC-SHA256 over data vector (RFC 2104)
|
* hmac_sha256_vector - HMAC-SHA256 over data vector (RFC 2104)
|
||||||
|
|
@ -2343,7 +2347,6 @@ static int os_memcmp(const void *s1, const void *s2, u8 n)
|
||||||
* @len: Lengths of the data blocks
|
* @len: Lengths of the data blocks
|
||||||
* @mac: Buffer for the hash (32 bytes)
|
* @mac: Buffer for the hash (32 bytes)
|
||||||
*/
|
*/
|
||||||
#if defined(CONFIG_TDLS)
|
|
||||||
static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
|
static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
|
||||||
u8 *addr[], size_t *len, u8 *mac)
|
u8 *addr[], size_t *len, u8 *mac)
|
||||||
{
|
{
|
||||||
|
|
@ -2362,7 +2365,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 is longer than 64 bytes reset it to key = SHA256(key) */
|
||||||
if (key_len > 64) {
|
if (key_len > 64) {
|
||||||
rtw_sha256_vector(1, &key, &key_len, tk);
|
sha256_vector(1, &key, &key_len, tk);
|
||||||
key = tk;
|
key = tk;
|
||||||
key_len = 32;
|
key_len = 32;
|
||||||
}
|
}
|
||||||
|
|
@ -2390,7 +2393,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
|
||||||
_addr[i + 1] = addr[i];
|
_addr[i + 1] = addr[i];
|
||||||
_len[i + 1] = len[i];
|
_len[i + 1] = len[i];
|
||||||
}
|
}
|
||||||
rtw_sha256_vector(1 + num_elem, _addr, _len, mac);
|
sha256_vector(1 + num_elem, _addr, _len, mac);
|
||||||
|
|
||||||
_rtw_memset(k_pad, 0, sizeof(k_pad));
|
_rtw_memset(k_pad, 0, sizeof(k_pad));
|
||||||
_rtw_memcpy(k_pad, key, key_len);
|
_rtw_memcpy(k_pad, key, key_len);
|
||||||
|
|
@ -2403,9 +2406,8 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
|
||||||
_len[0] = 64;
|
_len[0] = 64;
|
||||||
_addr[1] = mac;
|
_addr[1] = mac;
|
||||||
_len[1] = 32;
|
_len[1] = 32;
|
||||||
rtw_sha256_vector(2, _addr, _len, mac);
|
sha256_vector(2, _addr, _len, mac);
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_TDLS */
|
|
||||||
#endif /* PLATFORM_FREEBSD */
|
#endif /* PLATFORM_FREEBSD */
|
||||||
/**
|
/**
|
||||||
* sha256_prf - SHA256-based Pseudo-Random Function (IEEE 802.11r, 8.5.1.5.2)
|
* sha256_prf - SHA256-based Pseudo-Random Function (IEEE 802.11r, 8.5.1.5.2)
|
||||||
|
|
@ -2421,8 +2423,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
|
||||||
* given key.
|
* given key.
|
||||||
*/
|
*/
|
||||||
#ifndef PLATFORM_FREEBSD /* Baron */
|
#ifndef PLATFORM_FREEBSD /* Baron */
|
||||||
#if defined(CONFIG_TDLS)
|
static void sha256_prf(u8 *key, size_t key_len, char *label,
|
||||||
static void rtw_sha256_prf(u8 *key, size_t key_len, char *label,
|
|
||||||
u8 *data, size_t data_len, u8 *buf, size_t buf_len)
|
u8 *data, size_t data_len, u8 *buf, size_t buf_len)
|
||||||
{
|
{
|
||||||
u16 counter = 1;
|
u16 counter = 1;
|
||||||
|
|
@ -2446,10 +2447,10 @@ static void rtw_sha256_prf(u8 *key, size_t key_len, char *label,
|
||||||
while (pos < buf_len) {
|
while (pos < buf_len) {
|
||||||
plen = buf_len - pos;
|
plen = buf_len - pos;
|
||||||
WPA_PUT_LE16(counter_le, counter);
|
WPA_PUT_LE16(counter_le, counter);
|
||||||
if (plen >= RTW_SHA256_MAC_LEN) {
|
if (plen >= SHA256_MAC_LEN) {
|
||||||
hmac_sha256_vector(key, key_len, 4, addr, len,
|
hmac_sha256_vector(key, key_len, 4, addr, len,
|
||||||
&buf[pos]);
|
&buf[pos]);
|
||||||
pos += RTW_SHA256_MAC_LEN;
|
pos += SHA256_MAC_LEN;
|
||||||
} else {
|
} else {
|
||||||
hmac_sha256_vector(key, key_len, 4, addr, len, hash);
|
hmac_sha256_vector(key, key_len, 4, addr, len, hash);
|
||||||
_rtw_memcpy(&buf[pos], hash, plen);
|
_rtw_memcpy(&buf[pos], hash, plen);
|
||||||
|
|
@ -2458,7 +2459,6 @@ static void rtw_sha256_prf(u8 *key, size_t key_len, char *label,
|
||||||
counter++;
|
counter++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#endif /* PLATFORM_FREEBSD Baron */
|
#endif /* PLATFORM_FREEBSD Baron */
|
||||||
|
|
||||||
/* AES tables*/
|
/* AES tables*/
|
||||||
|
|
@ -3083,7 +3083,7 @@ int aes_siv_decrypt(const u8 *key, const u8 *iv_crypt, size_t iv_c_len,
|
||||||
#endif /* CONFIG_RTW_MESH_AEK */
|
#endif /* CONFIG_RTW_MESH_AEK */
|
||||||
|
|
||||||
#ifdef CONFIG_TDLS
|
#ifdef CONFIG_TDLS
|
||||||
void wpa_tdls_generate_tpk(_adapter *padapter, void *sta)
|
void wpa_tdls_generate_tpk(_adapter *padapter, PVOID sta)
|
||||||
{
|
{
|
||||||
struct sta_info *psta = (struct sta_info *)sta;
|
struct sta_info *psta = (struct sta_info *)sta;
|
||||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||||
|
|
@ -3108,7 +3108,7 @@ void wpa_tdls_generate_tpk(_adapter *padapter, void *sta)
|
||||||
nonce[1] = SNonce;
|
nonce[1] = SNonce;
|
||||||
}
|
}
|
||||||
|
|
||||||
rtw_sha256_vector(2, nonce, len, key_input);
|
sha256_vector(2, nonce, len, key_input);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TPK-Key-Data = KDF-N_KEY(TPK-Key-Input, "TDLS PMK",
|
* TPK-Key-Data = KDF-N_KEY(TPK-Key-Input, "TDLS PMK",
|
||||||
|
|
@ -3127,7 +3127,7 @@ void wpa_tdls_generate_tpk(_adapter *padapter, void *sta)
|
||||||
}
|
}
|
||||||
_rtw_memcpy(data + 2 * ETH_ALEN, get_bssid(pmlmepriv), ETH_ALEN);
|
_rtw_memcpy(data + 2 * ETH_ALEN, get_bssid(pmlmepriv), ETH_ALEN);
|
||||||
|
|
||||||
rtw_sha256_prf(key_input, RTW_SHA256_MAC_LEN, "TDLS PMK", data, sizeof(data), (u8 *) &psta->tpk, sizeof(psta->tpk));
|
sha256_prf(key_input, SHA256_MAC_LEN, "TDLS PMK", data, sizeof(data), (u8 *) &psta->tpk, sizeof(psta->tpk));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ inline void rtw_st_ctl_init(struct st_ctl_t *st_ctl)
|
||||||
_rtw_init_queue(&st_ctl->tracker_q);
|
_rtw_init_queue(&st_ctl->tracker_q);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void rtw_st_ctl_clear_tracker_q(struct st_ctl_t *st_ctl)
|
inline void rtw_st_ctl_clear_tracker_q(struct st_ctl_t *st_ctl)
|
||||||
{
|
{
|
||||||
_irqL irqL;
|
_irqL irqL;
|
||||||
_list *plist, *phead;
|
_list *plist, *phead;
|
||||||
|
|
|
||||||
|
|
@ -1038,7 +1038,7 @@ exit:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool rtw_sec_camid_is_used(struct cam_ctl_t *cam_ctl, u8 id)
|
inline bool rtw_sec_camid_is_used(struct cam_ctl_t *cam_ctl, u8 id)
|
||||||
{
|
{
|
||||||
_irqL irqL;
|
_irqL irqL;
|
||||||
bool ret;
|
bool ret;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
realtek-rtl8188eus DKMS module for Debian
|
realtek-rtl8188eus-dkms for Debian
|
||||||
|
---------------------------------
|
||||||
|
|
||||||
This package was automatically generated by the DKMS system,
|
This package was automatically generated by the DKMS system,
|
||||||
for distribution on Debian based operating systems.
|
for distribution on Debian based operating systems.
|
||||||
|
|
|
||||||
|
|
@ -1,154 +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 ]
|
|
||||||
* Set upstream metadata fields: Repository.
|
|
||||||
* Update standards version to 4.6.2, no changes needed.
|
|
||||||
|
|
||||||
[ Sophie Brun ]
|
|
||||||
* New upstream version 5.3.9~git20230101.f8ead57
|
|
||||||
* Refresh patches
|
|
||||||
* Add support for Linux Kernel 6.1
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Tue, 21 Feb 2023 14:51:34 +0100
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20221105.dab6e02-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
[ Kali Janitor ]
|
|
||||||
* Set upstream metadata fields: Repository-Browse.
|
|
||||||
|
|
||||||
[ Sophie Brun ]
|
|
||||||
* New upstream version 5.3.9~git20221105.dab6e02
|
|
||||||
* Refresh patches
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Thu, 10 Nov 2022 12:01:30 +0100
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20220829.4ba8e08-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
[ Arnaud Rebillout ]
|
|
||||||
* No more dh-exec (requires compat 13)
|
|
||||||
* Switch to dh-sequence-dkms
|
|
||||||
* Set PACKAGE_VERSION in override_dh_dkms
|
|
||||||
|
|
||||||
[ Kali Janitor ]
|
|
||||||
* Trim trailing whitespace.
|
|
||||||
* debian/copyright: use spaces rather than tabs to start continuation lines.
|
|
||||||
* Set upstream metadata fields: Bug-Database, Bug-Submit.
|
|
||||||
* Update standards version to 4.6.1, no changes needed.
|
|
||||||
|
|
||||||
[ Sophie Brun ]
|
|
||||||
* New upstream version 5.3.9~git20220829.4ba8e08
|
|
||||||
* Refresh patches
|
|
||||||
* Import upstream patch to fix the build with Linux 5.19
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Thu, 06 Oct 2022 15:05:27 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali3) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* Remove useless patch (we change version in debian/rules)
|
|
||||||
* Refresh patch
|
|
||||||
* Add a patch to fix the build with kernel 5.18
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Tue, 21 Jun 2022 12:20:45 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali2) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* Add a patch to fix build build with kernel 5.17
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Wed, 18 May 2022 17:50:10 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* New upstream version 5.3.9~git20220319.0958f29
|
|
||||||
* Refresh patches
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Thu, 12 May 2022 11:02:51 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali2) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
[ Ben Wilson ]
|
|
||||||
* Remove template comment and switch spaces to tabs
|
|
||||||
|
|
||||||
[ Sophie Brun ]
|
|
||||||
* Add a patch to fix the compilation with kernel 5.15
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Tue, 14 Dec 2021 17:56:08 +0100
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* New upstream version 5.3.9~git20210504.6146193
|
|
||||||
* Refresh patches
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Tue, 28 Sep 2021 11:00:05 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20210206.1e7145f-0kali2) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* Bump Standards-Version to 4.5.1
|
|
||||||
* Blacklist r8188eu
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Tue, 13 Jul 2021 10:50:42 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20210206.1e7145f-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* Update debian/watch
|
|
||||||
* New upstream version 5.3.9~git20210206.1e7145f
|
|
||||||
* Refresh patches
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Wed, 14 Apr 2021 17:25:11 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20201227-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* New upstream version 5.3.9~git20201227
|
|
||||||
* Refresh patches
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Tue, 26 Jan 2021 17:04:18 +0100
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20200829-0kali2) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* Fix errors introduced in 5a7f22 (lintian-overrides)
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Wed, 16 Sep 2020 15:54:13 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20200829-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* New upstream version 5.3.9~git20200829
|
|
||||||
* Refresh patches
|
|
||||||
* Add comment in debian/copyright
|
|
||||||
* Bump Standards-Version to 4.5.0
|
|
||||||
* Add lintian-overrides for dh-exec-subst-unknown-variable
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Wed, 16 Sep 2020 15:07:29 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20200710-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* New upstream version 5.3.9~20200710
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Fri, 10 Jul 2020 08:49:51 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~git20200316-0kali1) kali-dev; urgency=medium
|
|
||||||
|
|
||||||
* Configure git-buildpackage for Kali
|
|
||||||
* Add GitLab's CI configuration file
|
|
||||||
* New upstream version 5.3.9~git20200316
|
|
||||||
|
|
||||||
-- Sophie Brun <sophie@offensive-security.com> Thu, 14 May 2020 11:45:14 +0200
|
|
||||||
|
|
||||||
realtek-rtl8188eus-dkms (5.3.9~20191129-0kali1) kali-dev; urgency=medium
|
realtek-rtl8188eus-dkms (5.3.9~20191129-0kali1) kali-dev; urgency=medium
|
||||||
|
|
||||||
* Initial release (see 5842)
|
* Initial release (see 5842)
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@ Section: contrib/kernel
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Kali Developers <devel@kali.org>
|
Maintainer: Kali Developers <devel@kali.org>
|
||||||
Uploaders: Sophie Brun <sophie@offensive-security.com>
|
Uploaders: Sophie Brun <sophie@offensive-security.com>
|
||||||
Build-Depends: debhelper-compat (= 13), dh-sequence-dkms
|
Build-Depends: debhelper-compat (= 12), dkms, dh-exec
|
||||||
Standards-Version: 4.6.2
|
Standards-Version: 4.4.1
|
||||||
Homepage: https://github.com/aircrack-ng/rtl8188eus
|
Homepage: https://github.com/aircrack-ng/rtl8188eus
|
||||||
Vcs-Browser: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms
|
Vcs-Browser: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms
|
||||||
Vcs-Git: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms.git
|
Vcs-Git: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms.git
|
||||||
|
|
@ -16,3 +16,4 @@ Description: Realtek RTL8188EUS driver in DKMS format
|
||||||
This package provides the source code for RTL8188EUS Linux driver (with
|
This package provides the source code for RTL8188EUS Linux driver (with
|
||||||
monitor mode and frame injection) to be build with dkms. Kernel sources or
|
monitor mode and frame injection) to be build with dkms. Kernel sources or
|
||||||
headers are required to compile this module.
|
headers are required to compile this module.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
Upstream-Name: realtek-rtl8188eus-dkms
|
Upstream-Name: realtek-rtl8188eus-dkms
|
||||||
Source: https://github.com/aircrack-ng/rtl8188eus
|
Source: https://github.com/aircrack-ng/rtl8188eus
|
||||||
Comment: dkms package built during installation
|
|
||||||
|
|
||||||
Files: *
|
Files: *
|
||||||
Copyright: 2007 - 2017 Realtek Corporation.
|
Copyright: 2007 - 2017 Realtek Corporation.
|
||||||
|
|
@ -10,7 +9,7 @@ License: GPL-2
|
||||||
Files: os_dep/linux/rhashtable.*
|
Files: os_dep/linux/rhashtable.*
|
||||||
Copyright: 2015 Herbert Xu <herbert@gondor.apana.org.au>
|
Copyright: 2015 Herbert Xu <herbert@gondor.apana.org.au>
|
||||||
2014-2015 Thomas Graf <tgraf@suug.ch>
|
2014-2015 Thomas Graf <tgraf@suug.ch>
|
||||||
2008-2014 Patrick McHardy <kaber@trash.net>
|
2008-2014 Patrick McHardy <kaber@trash.net>
|
||||||
License: GPL-2
|
License: GPL-2
|
||||||
|
|
||||||
Files: debian/*
|
Files: debian/*
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
[DEFAULT]
|
|
||||||
debian-branch = kali/master
|
|
||||||
debian-tag = kali/%(version)s
|
|
||||||
pristine-tar = True
|
|
||||||
|
|
||||||
[pq]
|
|
||||||
patch-numbers = False
|
|
||||||
|
|
||||||
[dch]
|
|
||||||
multimaint-merge = True
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
include:
|
|
||||||
- https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
From: Sophie Brun <sophie@offensive-security.com>
|
|
||||||
Date: Tue, 21 Feb 2023 14:49:29 +0100
|
|
||||||
Subject: Add Linux 6.1 build support
|
|
||||||
|
|
||||||
Origin: https://github.com/aircrack-ng/rtl8188eus/pull/226
|
|
||||||
Forwarded: not-needed
|
|
||||||
---
|
|
||||||
dkms.conf | 1 -
|
|
||||||
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
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
From: Sophie Brun <sophie@offensive-security.com>
|
|
||||||
Date: Wed, 18 May 2022 17:47:55 +0200
|
|
||||||
Subject: Build support with kernel v5.17
|
|
||||||
|
|
||||||
Origin: https://github.com/aircrack-ng/rtl8188eus/commit/13cc38399eb44f234a52dde5f94509e54a09c71f
|
|
||||||
Forwarded: not-needed
|
|
||||||
---
|
|
||||||
os_dep/linux/rtw_proc.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c
|
|
||||||
index 8b1a424..9bd4041 100644
|
|
||||||
--- a/os_dep/linux/rtw_proc.c
|
|
||||||
+++ b/os_dep/linux/rtw_proc.c
|
|
||||||
@@ -39,6 +39,10 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void)
|
|
||||||
#define proc_get_parent_data(inode) PDE((inode))->parent->data
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
|
|
||||||
+#define PDE_DATA(inode) pde_data(inode)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
|
|
||||||
#define get_proc_net proc_net
|
|
||||||
#else
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
add-support-kernel-5.17.patch
|
|
||||||
add-linux-6.1-support.patch
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
# blacklist the driver
|
|
||||||
blacklist r8188eu
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
core hal include Kconfig Makefile os_dep platform usr/src/realtek-rtl8188eus-${env:DEB_VERSION_UPSTREAM}
|
#!/usr/bin/dh-exec
|
||||||
debian/r8188eus-dkms.conf etc/modprobe.d
|
core hal include Kconfig Makefile os_dep platform usr/src/realtek-rtl8188eus-${DEB_VERSION_UPSTREAM}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
|
#export DH_VERBOSE = 1
|
||||||
|
|
||||||
include /usr/share/dpkg/pkg-info.mk
|
include /usr/share/dpkg/pkg-info.mk
|
||||||
export DEB_VERSION_UPSTREAM
|
export DEB_VERSION_UPSTREAM
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@
|
dh $@ --with dkms
|
||||||
|
|
||||||
override_dh_dkms:
|
override_dh_dkms:
|
||||||
# Force PACKAGE_VERSION to be DEB_VERSION_UPSTREAM
|
dh_dkms -V $(DEB_VERSION_UPSTREAM) -- dkms.conf
|
||||||
sed -i dkms.conf -e 's%^PACKAGE_VERSION=.*%PACKAGE_VERSION="$(DEB_VERSION_UPSTREAM)"%'
|
|
||||||
dh_dkms -- dkms.conf
|
|
||||||
|
|
||||||
execute_after_dh_fixperms:
|
override_dh_fixperms:
|
||||||
|
dh_fixperms
|
||||||
find debian/realtek-rtl8188eus-dkms/usr/src -type f -exec chmod -x {} \;
|
find debian/realtek-rtl8188eus-dkms/usr/src -type f -exec chmod -x {} \;
|
||||||
|
|
||||||
# Nothing to configure, build or auto-install (all is done after
|
# Nothing to configure, build or auto-install (all is done after
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
if [ "$1" = '--upstream-version' ]; then
|
|
||||||
new_version="$2"
|
|
||||||
else
|
|
||||||
printf "Missing --upstream-version argument" 1>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
DEB_SOURCE="$(dpkg-parsechangelog -SSource)"
|
|
||||||
|
|
||||||
default_branch="$(git remote show https://github.com/aircrack-ng/rtl8188eus.git | grep 'HEAD' | sed 's/.*: v//')"
|
|
||||||
|
|
||||||
version="$(echo ${new_version} | sed 's/~git.*//')"
|
|
||||||
|
|
||||||
# fails if the upstream default branch has changed and is no longer the
|
|
||||||
# version mentioned in debian/watch
|
|
||||||
if [ "${default_branch}" != "${version}" ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
Test-Command: debian/tests/dkms-autopkgtest
|
|
||||||
Restrictions: needs-root allow-stderr
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
---
|
|
||||||
Bug-Database: https://github.com/aircrack-ng/rtl8188eus/issues
|
|
||||||
Bug-Submit: https://github.com/aircrack-ng/rtl8188eus/issues/new
|
|
||||||
Repository: https://github.com/aircrack-ng/rtl8188eus.git
|
|
||||||
Repository-Browse: https://github.com/aircrack-ng/rtl8188eus
|
|
||||||
|
|
@ -1,9 +1,4 @@
|
||||||
version=4
|
version=4
|
||||||
opts="mode=git, pretty=5.3.9~git%cd.%h, pgpmode=none" \
|
opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%realtek-rtl8188eus-dkms-$1.tar.gz%" \
|
||||||
https://github.com/aircrack-ng/rtl8188eus.git \
|
https://github.com/aircrack-ng/rtl8188eus/tags \
|
||||||
HEAD debian debian/script-targz
|
(?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
|
||||||
|
|
||||||
# Use the following when upstream starts to tag releases:
|
|
||||||
#opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%realtek-rtl8188eus-dkms-$1.tar.gz%" \
|
|
||||||
# https://github.com/aircrack-ng/rtl8188eus/tags \
|
|
||||||
# (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
PACKAGE_NAME="realtek-rtl8188eus"
|
PACKAGE_NAME="realtek-rtl8188eus"
|
||||||
PACKAGE_VERSION="5.3.9~20221105"
|
PACKAGE_VERSION="5.3.9~20191129"
|
||||||
CLEAN="'make' clean"
|
CLEAN="'make' clean"
|
||||||
BUILT_MODULE_NAME[0]=8188eu
|
BUILT_MODULE_NAME[0]=8188eu
|
||||||
PROCS_NUM=`nproc`
|
PROCS_NUM=`nproc`
|
||||||
|
|
|
||||||
|
|
@ -407,7 +407,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
|
||||||
return;
|
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;
|
precvpriv->is_any_non_be_pkts = _FALSE;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -939,7 +939,7 @@ s32 c2h_handler(_adapter *adapter, u8 id, u8 seq, u8 plen, u8 *payload)
|
||||||
#endif
|
#endif
|
||||||
case C2H_EXTEND:
|
case C2H_EXTEND:
|
||||||
sub_id = payload[0];
|
sub_id = payload[0];
|
||||||
__attribute__ ((__fallthrough__));
|
/* no handle, goto default */
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if (phydm_c2H_content_parsing(adapter_to_phydm(adapter), id, plen, payload) != TRUE)
|
if (phydm_c2H_content_parsing(adapter_to_phydm(adapter), id, plen, payload) != TRUE)
|
||||||
|
|
|
||||||
|
|
@ -171,7 +171,7 @@ void hal_mpt_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14)
|
||||||
} else if (IS_HARDWARE_TYPE_8723D(Adapter)) {
|
} else if (IS_HARDWARE_TYPE_8723D(Adapter)) {
|
||||||
/* 2.4G CCK TX DFIR */
|
/* 2.4G CCK TX DFIR */
|
||||||
/* 2016.01.20 Suggest from RS BB mingzhi*/
|
/* 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_TxFilter2, bMaskDWord, 0x0000B81C);
|
||||||
phy_set_bb_reg(Adapter, rCCK0_DebugPort, bMaskDWord, 0x00000000);
|
phy_set_bb_reg(Adapter, rCCK0_DebugPort, bMaskDWord, 0x00000000);
|
||||||
phy_set_bb_reg(Adapter, 0xAAC, bMaskDWord, 0x00003667);
|
phy_set_bb_reg(Adapter, 0xAAC, bMaskDWord, 0x00003667);
|
||||||
|
|
|
||||||
|
|
@ -354,7 +354,7 @@ halrf_cmn_info_init(
|
||||||
void
|
void
|
||||||
halrf_cmn_info_hook(
|
halrf_cmn_info_hook(
|
||||||
void *dm_void,
|
void *dm_void,
|
||||||
enum halrf_cmninfo_hook cmn_info,
|
u32 cmn_info,
|
||||||
void *value
|
void *value
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#ifndef __HALRF_FEATURES_H__
|
#ifndef __HALRF_FEATURES_H__
|
||||||
#define __HALRF_FEATURES_H__
|
#define __HALRF_FEATURES
|
||||||
|
|
||||||
#if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
|
#if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
|
|
||||||
#ifndef __PHYDMKFREE_H__
|
#ifndef __PHYDMKFREE_H__
|
||||||
#define __PHYDMKFREE_H__
|
#define __PHYDKFREE_H__
|
||||||
|
|
||||||
#define KFREE_VERSION "1.0"
|
#define KFREE_VERSION "1.0"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -52,10 +52,12 @@ phydm_rx_statistic_cal(
|
||||||
phydm->phy_dbg_info.ht_pkt_not_zero = true;
|
phydm->phy_dbg_info.ht_pkt_not_zero = true;
|
||||||
|
|
||||||
if (phydm->support_ic_type & PHYSTS_2ND_TYPE_IC) {
|
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]++;
|
phydm->phy_dbg_info.num_qry_ht_pkt[date_rate - ODM_RATEMCS0]++;
|
||||||
|
|
||||||
} else if (bw_idx == CHANNEL_WIDTH_20) {
|
} else if (bw_idx == CHANNEL_WIDTH_20) {
|
||||||
|
|
||||||
phydm->phy_dbg_info.num_qry_pkt_sc_20m[date_rate - ODM_RATEMCS0]++;
|
phydm->phy_dbg_info.num_qry_pkt_sc_20m[date_rate - ODM_RATEMCS0]++;
|
||||||
phydm->phy_dbg_info.low_bw_20_occur = true;
|
phydm->phy_dbg_info.low_bw_20_occur = true;
|
||||||
}
|
}
|
||||||
|
|
@ -79,6 +81,7 @@ phydm_rx_statistic_cal(
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
phydm->phy_dbg_info.vht_pkt_not_zero = true;
|
phydm->phy_dbg_info.vht_pkt_not_zero = true;
|
||||||
|
|
||||||
if (phydm->support_ic_type & PHYSTS_2ND_TYPE_IC) {
|
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_vht_pkt[date_rate - ODM_RATEVHTSS1MCS0]++;
|
phydm->phy_dbg_info.num_qry_vht_pkt[date_rate - ODM_RATEVHTSS1MCS0]++;
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@
|
||||||
|
|
||||||
/*#define CONFIG_ANTENNA_DIVERSITY*/
|
/*#define CONFIG_ANTENNA_DIVERSITY*/
|
||||||
|
|
||||||
//#define CONFIG_CONCURRENT_MODE
|
#define CONFIG_CONCURRENT_MODE
|
||||||
#ifdef CONFIG_CONCURRENT_MODE
|
#ifdef CONFIG_CONCURRENT_MODE
|
||||||
#define CONFIG_RUNTIME_PORT_SWITCH
|
#define CONFIG_RUNTIME_PORT_SWITCH
|
||||||
#define CONFIG_SCAN_BACKOP
|
#define CONFIG_SCAN_BACKOP
|
||||||
|
|
|
||||||
|
|
@ -1529,13 +1529,12 @@ enum ieee80211_state {
|
||||||
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
|
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
|
||||||
(((Addr[5]) & 0xff) == 0xff))
|
(((Addr[5]) & 0xff) == 0xff))
|
||||||
#else
|
#else
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 00))
|
|
||||||
extern __inline int is_multicast_mac_addr(const u8 *addr)
|
extern __inline int is_multicast_mac_addr(const u8 *addr)
|
||||||
{
|
{
|
||||||
return (addr[0] != 0xff) && (0x01 & addr[0]);
|
return (addr[0] != 0xff) && (0x01 & addr[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline int is_broadcast_mac_addr(const u8 *addr)
|
extern __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||||
{
|
{
|
||||||
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
|
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
|
||||||
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
|
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
|
||||||
|
|
@ -1546,24 +1545,6 @@ extern __inline int is_zero_mac_addr(const u8 *addr)
|
||||||
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
|
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
|
||||||
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 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 */
|
#endif /* PLATFORM_FREEBSD */
|
||||||
|
|
||||||
#define CFG_IEEE80211_RESERVE_FCS (1<<0)
|
#define CFG_IEEE80211_RESERVE_FCS (1<<0)
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
* more details.
|
* more details.
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
#ifndef _RTL8812A_SRESET_H_
|
#ifndef _RTL88812A_SRESET_H_
|
||||||
#define _RTL8812A_SRESET_H_
|
#define _RTL8812A_SRESET_H_
|
||||||
|
|
||||||
#include <rtw_sreset.h>
|
#include <rtw_sreset.h>
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
* more details.
|
* more details.
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
#ifndef _RTL8812A_SRESET_H_
|
#ifndef _RTL88812A_SRESET_H_
|
||||||
#define _RTL8812A_SRESET_H_
|
#define _RTL8812A_SRESET_H_
|
||||||
|
|
||||||
#include <rtw_sreset.h>
|
#include <rtw_sreset.h>
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ const char *security_type_str(u8 value);
|
||||||
#define _WPA_IE_ID_ 0xdd
|
#define _WPA_IE_ID_ 0xdd
|
||||||
#define _WPA2_IE_ID_ 0x30
|
#define _WPA2_IE_ID_ 0x30
|
||||||
|
|
||||||
#define RTW_SHA256_MAC_LEN 32
|
#define SHA256_MAC_LEN 32
|
||||||
#define AES_BLOCK_SIZE 16
|
#define AES_BLOCK_SIZE 16
|
||||||
#define AES_PRIV_SIZE (4 * 44)
|
#define AES_PRIV_SIZE (4 * 44)
|
||||||
|
|
||||||
|
|
@ -249,7 +249,7 @@ struct security_priv {
|
||||||
#define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
|
#define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct rtw_sha256_state {
|
struct sha256_state {
|
||||||
u64 length;
|
u64 length;
|
||||||
u32 state[8], curlen;
|
u32 state[8], curlen;
|
||||||
u8 buf[64];
|
u8 buf[64];
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
#define DBG_RTW_CFG80211_MESH_CONF 0
|
#define DBG_RTW_CFG80211_MESH_CONF 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) || defined(RHEL79))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
|
||||||
#define STATION_INFO_INACTIVE_TIME BIT(NL80211_STA_INFO_INACTIVE_TIME)
|
#define STATION_INFO_INACTIVE_TIME BIT(NL80211_STA_INFO_INACTIVE_TIME)
|
||||||
#define STATION_INFO_LLID BIT(NL80211_STA_INFO_LLID)
|
#define STATION_INFO_LLID BIT(NL80211_STA_INFO_LLID)
|
||||||
#define STATION_INFO_PLID BIT(NL80211_STA_INFO_PLID)
|
#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";
|
return "80+80";
|
||||||
case NL80211_CHAN_WIDTH_160:
|
case NL80211_CHAN_WIDTH_160:
|
||||||
return "160";
|
return "160";
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) || defined(RHEL79))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
|
||||||
case NL80211_CHAN_WIDTH_5:
|
case NL80211_CHAN_WIDTH_5:
|
||||||
return "5";
|
return "5";
|
||||||
case NL80211_CHAN_WIDTH_10:
|
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;
|
*ch = chan->hw_value;
|
||||||
break;
|
break;
|
||||||
case NL80211_CHAN_WIDTH_80P80:
|
case NL80211_CHAN_WIDTH_80P80:
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) || defined(RHEL79))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
|
||||||
case NL80211_CHAN_WIDTH_5:
|
case NL80211_CHAN_WIDTH_5:
|
||||||
case NL80211_CHAN_WIDTH_10:
|
case NL80211_CHAN_WIDTH_10:
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -417,13 +417,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
|
||||||
if (ret != _SUCCESS)
|
if (ret != _SUCCESS)
|
||||||
goto exit;
|
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);
|
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
|
||||||
#endif
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
int freq = rtw_ch2freq(ch);
|
int freq = rtw_ch2freq(ch);
|
||||||
|
|
@ -692,12 +686,14 @@ static int rtw_cfg80211_sync_iftype(_adapter *adapter)
|
||||||
|
|
||||||
static u64 rtw_get_systime_us(void)
|
static u64 rtw_get_systime_us(void)
|
||||||
{
|
{
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
|
||||||
struct timespec ts;
|
struct timespec ts;
|
||||||
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0))
|
||||||
|
getboottime(&ts);
|
||||||
|
#else
|
||||||
get_monotonic_boottime(&ts);
|
get_monotonic_boottime(&ts);
|
||||||
|
#endif
|
||||||
return ((u64)ts.tv_sec * 1000000) + ts.tv_nsec / 1000;
|
return ((u64)ts.tv_sec * 1000000) + ts.tv_nsec / 1000;
|
||||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0))
|
|
||||||
return ktime_to_us(ktime_get_boottime());
|
|
||||||
#else
|
#else
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
do_gettimeofday(&tv);
|
do_gettimeofday(&tv);
|
||||||
|
|
@ -950,7 +946,7 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter)
|
||||||
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
|
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
|
||||||
struct wireless_dev *pwdev = padapter->rtw_wdev;
|
struct wireless_dev *pwdev = padapter->rtw_wdev;
|
||||||
struct cfg80211_bss *bss = NULL;
|
struct cfg80211_bss *bss = NULL;
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL79))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
|
||||||
struct wiphy *wiphy = pwdev->wiphy;
|
struct wiphy *wiphy = pwdev->wiphy;
|
||||||
int freq = 2412;
|
int freq = 2412;
|
||||||
struct ieee80211_channel *notify_channel;
|
struct ieee80211_channel *notify_channel;
|
||||||
|
|
@ -1008,7 +1004,7 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter)
|
||||||
RTW_PRINT(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
|
RTW_PRINT(FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
|
||||||
}
|
}
|
||||||
/* notify cfg80211 that device joined an IBSS */
|
/* notify cfg80211 that device joined an IBSS */
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL79))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
|
||||||
notify_channel = ieee80211_get_channel(wiphy, freq);
|
notify_channel = ieee80211_get_channel(wiphy, freq);
|
||||||
cfg80211_ibss_joined(padapter->pnetdev, cur_network->network.MacAddress, notify_channel, GFP_ATOMIC);
|
cfg80211_ibss_joined(padapter->pnetdev, cur_network->network.MacAddress, notify_channel, GFP_ATOMIC);
|
||||||
#else
|
#else
|
||||||
|
|
@ -1096,7 +1092,7 @@ check_bss:
|
||||||
struct ieee80211_channel *notify_channel;
|
struct ieee80211_channel *notify_channel;
|
||||||
u32 freq;
|
u32 freq;
|
||||||
u16 channel = cur_network->network.Configuration.DSConfig;
|
u16 channel = cur_network->network.Configuration.DSConfig;
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL79))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
|
||||||
struct cfg80211_roam_info roam_info;
|
struct cfg80211_roam_info roam_info;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -1104,13 +1100,8 @@ check_bss:
|
||||||
notify_channel = ieee80211_get_channel(wiphy, freq);
|
notify_channel = ieee80211_get_channel(wiphy, freq);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL79))
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
|
||||||
#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;
|
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 = 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.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;
|
roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6;
|
||||||
|
|
@ -1137,22 +1128,18 @@ check_bss:
|
||||||
rtw_ft_set_status(padapter, RTW_FT_ASSOCIATED_STA);
|
rtw_ft_set_status(padapter, RTW_FT_ASSOCIATED_STA);
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
#if !defined(RHEL79) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE))
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
|
RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
|
||||||
#endif
|
#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
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
, 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);
|
RTW_INFO("pwdev->sme_state(a)=%d\n", pwdev->sme_state);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
@ -1208,7 +1195,7 @@ void rtw_cfg80211_indicate_disconnect(_adapter *padapter, u16 reason, u8 locally
|
||||||
_enter_critical_bh(&pwdev_priv->connect_req_lock, &irqL);
|
_enter_critical_bh(&pwdev_priv->connect_req_lock, &irqL);
|
||||||
|
|
||||||
if (padapter->ndev_unregistering || !rtw_wdev_not_indic_disco(pwdev_priv)) {
|
if (padapter->ndev_unregistering || !rtw_wdev_not_indic_disco(pwdev_priv)) {
|
||||||
#if (!defined(RHEL79) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)))
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
|
RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
|
||||||
|
|
||||||
if (pwdev->sme_state == CFG80211_SME_CONNECTING) {
|
if (pwdev->sme_state == CFG80211_SME_CONNECTING) {
|
||||||
|
|
@ -1667,9 +1654,6 @@ exit:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev
|
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
|
, u8 key_index
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
, bool pairwise
|
, bool pairwise
|
||||||
|
|
@ -1814,9 +1798,6 @@ addkey_end:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
|
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
|
, u8 keyid
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
, bool pairwise
|
, bool pairwise
|
||||||
|
|
@ -1982,9 +1963,6 @@ exit:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
|
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)
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
u8 key_index, bool pairwise, const u8 *mac_addr)
|
u8 key_index, bool pairwise, const u8 *mac_addr)
|
||||||
#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */
|
#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */
|
||||||
|
|
@ -2005,11 +1983,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
|
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)
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
, bool unicast, bool multicast
|
, bool unicast, bool multicast
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -2057,11 +2031,7 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
|
||||||
int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
|
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_FMT " key_index=%d"
|
||||||
#define SET_DEF_KEY_PARAM_ARG , key_index
|
#define SET_DEF_KEY_PARAM_ARG , key_index
|
||||||
|
|
@ -2397,7 +2367,6 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
|
||||||
case NL80211_IFTYPE_P2P_CLIENT:
|
case NL80211_IFTYPE_P2P_CLIENT:
|
||||||
is_p2p = _TRUE;
|
is_p2p = _TRUE;
|
||||||
#endif
|
#endif
|
||||||
__attribute__ ((__fallthrough__));
|
|
||||||
case NL80211_IFTYPE_STATION:
|
case NL80211_IFTYPE_STATION:
|
||||||
networkType = Ndis802_11Infrastructure;
|
networkType = Ndis802_11Infrastructure;
|
||||||
|
|
||||||
|
|
@ -2422,7 +2391,6 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
|
||||||
case NL80211_IFTYPE_P2P_GO:
|
case NL80211_IFTYPE_P2P_GO:
|
||||||
is_p2p = _TRUE;
|
is_p2p = _TRUE;
|
||||||
#endif
|
#endif
|
||||||
__attribute__ ((__fallthrough__));
|
|
||||||
case NL80211_IFTYPE_AP:
|
case NL80211_IFTYPE_AP:
|
||||||
networkType = Ndis802_11APMode;
|
networkType = Ndis802_11APMode;
|
||||||
|
|
||||||
|
|
@ -2480,7 +2448,7 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
|
||||||
struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(adapter);
|
struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(adapter);
|
||||||
_irqL irqL;
|
_irqL irqL;
|
||||||
|
|
||||||
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
|
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
|
||||||
struct cfg80211_scan_info info;
|
struct cfg80211_scan_info info;
|
||||||
|
|
||||||
memset(&info, 0, sizeof(info));
|
memset(&info, 0, sizeof(info));
|
||||||
|
|
@ -2497,7 +2465,7 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
|
||||||
if (pwdev_priv->scan_request->wiphy != pwdev_priv->rtw_wdev->wiphy)
|
if (pwdev_priv->scan_request->wiphy != pwdev_priv->rtw_wdev->wiphy)
|
||||||
RTW_INFO("error wiphy compare\n");
|
RTW_INFO("error wiphy compare\n");
|
||||||
else
|
else
|
||||||
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
|
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
|
||||||
cfg80211_scan_done(pwdev_priv->scan_request, &info);
|
cfg80211_scan_done(pwdev_priv->scan_request, &info);
|
||||||
#else
|
#else
|
||||||
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
|
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
|
||||||
|
|
@ -3087,7 +3055,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
|
||||||
|
|
||||||
check_need_indicate_scan_done:
|
check_need_indicate_scan_done:
|
||||||
if (_TRUE == need_indicate_scan_done) {
|
if (_TRUE == need_indicate_scan_done) {
|
||||||
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
|
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
|
||||||
struct cfg80211_scan_info info;
|
struct cfg80211_scan_info info;
|
||||||
|
|
||||||
memset(&info, 0, sizeof(info));
|
memset(&info, 0, sizeof(info));
|
||||||
|
|
@ -3095,7 +3063,7 @@ check_need_indicate_scan_done:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
_rtw_cfg80211_surveydone_event_callback(padapter, request);
|
_rtw_cfg80211_surveydone_event_callback(padapter, request);
|
||||||
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE || defined(RHEL79))
|
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
|
||||||
cfg80211_scan_done(request, &info);
|
cfg80211_scan_done(request, &info);
|
||||||
#else
|
#else
|
||||||
cfg80211_scan_done(request, 0);
|
cfg80211_scan_done(request, 0);
|
||||||
|
|
@ -4492,12 +4460,6 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name,
|
||||||
goto out;
|
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;
|
mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP;
|
||||||
strncpy(mon_ndev->name, name, IFNAMSIZ);
|
strncpy(mon_ndev->name, name, IFNAMSIZ);
|
||||||
mon_ndev->name[IFNAMSIZ - 1] = 0;
|
mon_ndev->name[IFNAMSIZ - 1] = 0;
|
||||||
|
|
@ -4908,11 +4870,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
|
||||||
return ret;
|
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)
|
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
|
_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
|
||||||
|
|
||||||
|
|
@ -7130,11 +7088,6 @@ exit:
|
||||||
return ret;
|
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,
|
static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
||||||
struct wireless_dev *wdev,
|
struct wireless_dev *wdev,
|
||||||
|
|
@ -7142,12 +7095,12 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
|
||||||
struct net_device *ndev,
|
struct net_device *ndev,
|
||||||
#endif
|
#endif
|
||||||
u16 frame_type, bool reg)
|
u16 frame_type, bool reg)
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
||||||
struct net_device *ndev = wdev_to_ndev(wdev);
|
struct net_device *ndev = wdev_to_ndev(wdev);
|
||||||
#endif
|
#endif
|
||||||
_adapter *adapter;
|
_adapter *adapter;
|
||||||
|
|
||||||
struct rtw_wdev_priv *pwdev_priv;
|
struct rtw_wdev_priv *pwdev_priv;
|
||||||
|
|
||||||
if (ndev == NULL)
|
if (ndev == NULL)
|
||||||
|
|
@ -7161,6 +7114,20 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
|
||||||
frame_type, reg);
|
frame_type, reg);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Wait QC Verify */
|
||||||
|
return;
|
||||||
|
|
||||||
|
switch (frame_type) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
exit:
|
exit:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -9148,8 +9115,7 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \
|
#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;
|
wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
|
||||||
#ifdef CONFIG_PNO_SUPPORT
|
#ifdef CONFIG_PNO_SUPPORT
|
||||||
wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
|
wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
|
||||||
|
|
@ -9160,7 +9126,7 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
|
#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) && !defined(RHEL79))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))
|
||||||
wiphy->wowlan = wowlan_stub;
|
wiphy->wowlan = wowlan_stub;
|
||||||
#else
|
#else
|
||||||
wiphy->wowlan = &wowlan_stub;
|
wiphy->wowlan = &wowlan_stub;
|
||||||
|
|
@ -9466,11 +9432,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
.mgmt_tx = cfg80211_rtw_mgmt_tx,
|
.mgmt_tx = cfg80211_rtw_mgmt_tx,
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
|
|
||||||
.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register,
|
|
||||||
#else
|
|
||||||
.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
|
.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
|
||||||
#endif
|
|
||||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
|
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
|
||||||
.action = cfg80211_rtw_mgmt_tx,
|
.action = cfg80211_rtw_mgmt_tx,
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -9670,11 +9632,7 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
|
||||||
rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
|
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(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
|
|
||||||
if (wdev->connected) {
|
|
||||||
#else
|
|
||||||
if (wdev->current_bss) {
|
if (wdev->current_bss) {
|
||||||
#endif
|
|
||||||
RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
|
RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
|
||||||
rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
|
rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -168,10 +168,6 @@ struct rtw_wdev_priv {
|
||||||
bool block_scan;
|
bool block_scan;
|
||||||
bool power_mgmt;
|
bool power_mgmt;
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
|
|
||||||
u32 mgmt_mask;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* report mgmt_frame registered */
|
/* report mgmt_frame registered */
|
||||||
u16 report_mgmt;
|
u16 report_mgmt;
|
||||||
|
|
||||||
|
|
@ -362,8 +358,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)
|
#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) && !defined(RHEL79))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0))
|
||||||
#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)
|
#define rtw_cfg80211_disconnected(wdev, reason, ie, ie_len, locally_generated, gfp) cfg80211_disconnected(wdev_to_ndev(wdev), reason, ie, ie_len, gfp)
|
||||||
#else
|
#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)
|
#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
|
#endif
|
||||||
|
|
@ -384,7 +380,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);
|
u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8 ht);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL79) )
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))
|
||||||
#define NL80211_BAND_2GHZ IEEE80211_BAND_2GHZ
|
#define NL80211_BAND_2GHZ IEEE80211_BAND_2GHZ
|
||||||
#define NL80211_BAND_5GHZ IEEE80211_BAND_5GHZ
|
#define NL80211_BAND_5GHZ IEEE80211_BAND_5GHZ
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
||||||
|
|
|
||||||
|
|
@ -9789,7 +9789,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
|
||||||
rtw_hal_read_chip_info(padapter);
|
rtw_hal_read_chip_info(padapter);
|
||||||
/* set mac addr*/
|
/* set mac addr*/
|
||||||
rtw_macaddr_cfg(adapter_mac_addr(padapter), get_hal_mac_addr(padapter));
|
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
|
#ifdef CONFIG_P2P
|
||||||
rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));
|
rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));
|
||||||
|
|
|
||||||
|
|
@ -817,7 +817,7 @@ void rtw_regsty_load_target_tx_power(struct registry_priv *regsty)
|
||||||
#endif /* CONFIG_IEEE80211_BAND_5GHZ */
|
#endif /* CONFIG_IEEE80211_BAND_5GHZ */
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void rtw_regsty_load_excl_chs(struct registry_priv *regsty)
|
inline void rtw_regsty_load_excl_chs(struct registry_priv *regsty)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int ch_num = 0;
|
int ch_num = 0;
|
||||||
|
|
@ -831,7 +831,7 @@ static inline void rtw_regsty_load_excl_chs(struct registry_priv *regsty)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_80211N_HT
|
#ifdef CONFIG_80211N_HT
|
||||||
static inline void rtw_regsty_init_rx_ampdu_sz_limit(struct registry_priv *regsty)
|
inline void rtw_regsty_init_rx_ampdu_sz_limit(struct registry_priv *regsty)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
uint *sz_limit;
|
uint *sz_limit;
|
||||||
|
|
@ -1199,11 +1199,7 @@ 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 */
|
_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 */
|
_rtw_memcpy(pnetdev->dev_addr, sa->sa_data, ETH_ALEN); /* set mac addr to net_device */
|
||||||
#endif
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
if (rtw_is_hw_init_completed(padapter)) {
|
if (rtw_is_hw_init_completed(padapter)) {
|
||||||
|
|
@ -1288,18 +1284,17 @@ unsigned int rtw_classify8021d(struct sk_buff *skb)
|
||||||
return dscp >> 5;
|
return dscp >> 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0))
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
|
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
|
||||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
|
struct net_device *sb_dev)
|
||||||
, void *accel_priv
|
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
|
||||||
#else
|
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
|
||||||
, struct net_device *sb_dev
|
struct net_device *sb_dev,
|
||||||
#endif
|
select_queue_fallback_t fallback)
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0))
|
#else
|
||||||
, select_queue_fallback_t fallback
|
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb,
|
||||||
#endif
|
void *accel_priv, select_queue_fallback_t fallback)
|
||||||
#endif
|
#endif
|
||||||
)
|
|
||||||
{
|
{
|
||||||
_adapter *padapter = rtw_netdev_priv(dev);
|
_adapter *padapter = rtw_netdev_priv(dev);
|
||||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||||
|
|
@ -1517,12 +1512,6 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
|
||||||
if (!pnetdev)
|
if (!pnetdev)
|
||||||
return NULL;
|
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 = rtw_netdev_priv(pnetdev);
|
||||||
padapter->pnetdev = pnetdev;
|
padapter->pnetdev = pnetdev;
|
||||||
|
|
||||||
|
|
@ -1618,11 +1607,7 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
|
||||||
u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);
|
u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);
|
||||||
|
|
||||||
#ifdef CONFIG_RTW_NAPI
|
#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 */
|
#endif /* CONFIG_RTW_NAPI */
|
||||||
|
|
||||||
#if defined(CONFIG_IOCTL_CFG80211)
|
#if defined(CONFIG_IOCTL_CFG80211)
|
||||||
|
|
@ -1636,11 +1621,7 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
|
||||||
/* alloc netdev name */
|
/* alloc netdev name */
|
||||||
rtw_init_netdev_name(ndev, 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);
|
_rtw_memcpy(ndev->dev_addr, adapter_mac_addr(adapter), ETH_ALEN);
|
||||||
#endif
|
|
||||||
#if defined(CONFIG_NET_NS)
|
#if defined(CONFIG_NET_NS)
|
||||||
dev_net_set(ndev, wiphy_net(adapter_to_wiphy(adapter)));
|
dev_net_set(ndev, wiphy_net(adapter_to_wiphy(adapter)));
|
||||||
#endif //defined(CONFIG_NET_NS)
|
#endif //defined(CONFIG_NET_NS)
|
||||||
|
|
|
||||||
|
|
@ -354,11 +354,7 @@ static int napi_recv(_adapter *padapter, int budget)
|
||||||
|
|
||||||
#ifdef CONFIG_RTW_GRO
|
#ifdef CONFIG_RTW_GRO
|
||||||
if (pregistrypriv->en_gro) {
|
if (pregistrypriv->en_gro) {
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0))
|
|
||||||
if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_DROP)
|
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;
|
rx_ok = _TRUE;
|
||||||
goto next;
|
goto next;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@ struct sk_buff *rtw_cfg80211_vendor_event_alloc(
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0))
|
||||||
skb = cfg80211_vendor_event_alloc(wiphy, NULL, len, event_id, gfp);
|
skb = cfg80211_vendor_event_alloc(wiphy, len, event_id, gfp);
|
||||||
#else
|
#else
|
||||||
skb = cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp);
|
skb = cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -45,10 +45,6 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void)
|
||||||
#define get_proc_net init_net.proc_net
|
#define get_proc_net init_net.proc_net
|
||||||
#endif
|
#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)
|
inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_dir_entry *parent, void *data)
|
||||||
{
|
{
|
||||||
struct proc_dir_entry *entry;
|
struct proc_dir_entry *entry;
|
||||||
|
|
@ -66,12 +62,7 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_
|
||||||
}
|
}
|
||||||
|
|
||||||
inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
|
inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
|
const struct file_operations *fops, void * data)
|
||||||
const struct proc_ops *fops, void * data)
|
|
||||||
#else
|
|
||||||
const struct file_operations *fops, void * data)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
{
|
{
|
||||||
struct proc_dir_entry *entry;
|
struct proc_dir_entry *entry;
|
||||||
|
|
||||||
|
|
@ -239,26 +230,6 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer,
|
||||||
return -EROFS;
|
return -EROFS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
|
|
||||||
static const struct proc_ops rtw_drv_proc_seq_fops = {
|
|
||||||
//.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_drv_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = seq_release,
|
|
||||||
.proc_write = rtw_drv_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct proc_ops rtw_drv_proc_sseq_fops = {
|
|
||||||
//.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_drv_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = single_release,
|
|
||||||
.proc_write = rtw_drv_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
#else
|
|
||||||
static const struct file_operations rtw_drv_proc_seq_fops = {
|
static const struct file_operations rtw_drv_proc_seq_fops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.open = rtw_drv_proc_open,
|
.open = rtw_drv_proc_open,
|
||||||
|
|
@ -276,7 +247,6 @@ static const struct file_operations rtw_drv_proc_sseq_fops = {
|
||||||
.release = single_release,
|
.release = single_release,
|
||||||
.write = rtw_drv_proc_write,
|
.write = rtw_drv_proc_write,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
int rtw_drv_proc_init(void)
|
int rtw_drv_proc_init(void)
|
||||||
{
|
{
|
||||||
|
|
@ -3713,27 +3683,6 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff
|
||||||
return -EROFS;
|
return -EROFS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
|
|
||||||
static const struct proc_ops rtw_adapter_proc_seq_fops = {
|
|
||||||
//.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_adapter_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = seq_release,
|
|
||||||
.proc_write = rtw_adapter_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct proc_ops rtw_adapter_proc_sseq_fops = {
|
|
||||||
//.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_adapter_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = single_release,
|
|
||||||
.proc_write = rtw_adapter_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
static const struct file_operations rtw_adapter_proc_seq_fops = {
|
static const struct file_operations rtw_adapter_proc_seq_fops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.open = rtw_adapter_proc_open,
|
.open = rtw_adapter_proc_open,
|
||||||
|
|
@ -3751,7 +3700,6 @@ static const struct file_operations rtw_adapter_proc_sseq_fops = {
|
||||||
.release = single_release,
|
.release = single_release,
|
||||||
.write = rtw_adapter_proc_write,
|
.write = rtw_adapter_proc_write,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
int proc_get_odm_adaptivity(struct seq_file *m, void *v)
|
int proc_get_odm_adaptivity(struct seq_file *m, void *v)
|
||||||
{
|
{
|
||||||
|
|
@ -3907,26 +3855,6 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer,
|
||||||
return -EROFS;
|
return -EROFS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
|
|
||||||
static const struct proc_ops rtw_odm_proc_seq_fops = {
|
|
||||||
//.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_odm_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = seq_release,
|
|
||||||
.proc_write = rtw_odm_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct proc_ops rtw_odm_proc_sseq_fops = {
|
|
||||||
//.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_odm_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = single_release,
|
|
||||||
.proc_write = rtw_odm_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
#else
|
|
||||||
static const struct file_operations rtw_odm_proc_seq_fops = {
|
static const struct file_operations rtw_odm_proc_seq_fops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.open = rtw_odm_proc_open,
|
.open = rtw_odm_proc_open,
|
||||||
|
|
@ -3945,8 +3873,6 @@ static const struct file_operations rtw_odm_proc_sseq_fops = {
|
||||||
.write = rtw_odm_proc_write,
|
.write = rtw_odm_proc_write,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
|
struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct proc_dir_entry *dir_odm = NULL;
|
struct proc_dir_entry *dir_odm = NULL;
|
||||||
|
|
@ -4070,26 +3996,6 @@ static ssize_t rtw_mcc_proc_write(struct file *file, const char __user *buffer,
|
||||||
return -EROFS;
|
return -EROFS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
|
|
||||||
static const struct proc_ops rtw_mcc_proc_seq_fops = {
|
|
||||||
.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_mcc_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = seq_release,
|
|
||||||
.proc_write = rtw_mcc_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct proc_ops rtw_mcc_proc_sseq_fops = {
|
|
||||||
.proc_owner = THIS_MODULE,
|
|
||||||
.proc_open = rtw_mcc_proc_open,
|
|
||||||
.proc_read = seq_read,
|
|
||||||
.proc_lseek = seq_lseek,
|
|
||||||
.proc_release = single_release,
|
|
||||||
.proc_write = rtw_mcc_proc_write,
|
|
||||||
};
|
|
||||||
|
|
||||||
#else
|
|
||||||
static const struct file_operations rtw_mcc_proc_seq_fops = {
|
static const struct file_operations rtw_mcc_proc_seq_fops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.open = rtw_mcc_proc_open,
|
.open = rtw_mcc_proc_open,
|
||||||
|
|
@ -4107,7 +4013,6 @@ static const struct file_operations rtw_mcc_proc_sseq_fops = {
|
||||||
.release = single_release,
|
.release = single_release,
|
||||||
.write = rtw_mcc_proc_write,
|
.write = rtw_mcc_proc_write,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
struct proc_dir_entry *rtw_mcc_proc_init(struct net_device *dev)
|
struct proc_dir_entry *rtw_mcc_proc_init(struct net_device *dev)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -158,9 +158,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
|
||||||
{USB_DEVICE(0x2001, 0x330F), .driver_info = RTL8188E}, /* DLink DWA-125 REV D1 */
|
{USB_DEVICE(0x2001, 0x330F), .driver_info = RTL8188E}, /* DLink DWA-125 REV D1 */
|
||||||
{USB_DEVICE(0x2001, 0x3310), .driver_info = RTL8188E}, /* Dlink DWA-123 REV D1 */
|
{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, 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
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_RTL8812A
|
#ifdef CONFIG_RTL8812A
|
||||||
|
|
|
||||||
|
|
@ -294,7 +294,7 @@ void rtw_regd_apply_flags(struct wiphy *wiphy)
|
||||||
&& rtw_odm_dfs_domain_unknown(padapter)
|
&& rtw_odm_dfs_domain_unknown(padapter)
|
||||||
#endif
|
#endif
|
||||||
) {
|
) {
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(RHEL79))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
|
||||||
ch->flags = (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_PASSIVE_SCAN);
|
ch->flags = (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_PASSIVE_SCAN);
|
||||||
#else
|
#else
|
||||||
ch->flags = IEEE80211_CHAN_NO_IR;
|
ch->flags = IEEE80211_CHAN_NO_IR;
|
||||||
|
|
@ -309,7 +309,7 @@ void rtw_regd_apply_flags(struct wiphy *wiphy)
|
||||||
#endif
|
#endif
|
||||||
) {
|
) {
|
||||||
ch->flags |= IEEE80211_CHAN_RADAR;
|
ch->flags |= IEEE80211_CHAN_RADAR;
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(RHEL79))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
|
||||||
ch->flags |= (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_PASSIVE_SCAN);
|
ch->flags |= (IEEE80211_CHAN_NO_IBSS | IEEE80211_CHAN_PASSIVE_SCAN);
|
||||||
#else
|
#else
|
||||||
ch->flags |= IEEE80211_CHAN_NO_IR;
|
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;
|
wiphy->reg_notifier = rtw_reg_notifier;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(RHEL79))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
|
||||||
wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
|
wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
|
||||||
wiphy->flags &= ~WIPHY_FLAG_STRICT_REGULATORY;
|
wiphy->flags &= ~WIPHY_FLAG_STRICT_REGULATORY;
|
||||||
wiphy->flags &= ~WIPHY_FLAG_DISABLE_BEACON_HINTS;
|
wiphy->flags &= ~WIPHY_FLAG_DISABLE_BEACON_HINTS;
|
||||||
|
|
|
||||||
|
|
@ -286,7 +286,7 @@ inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb)
|
||||||
return skb_clone(skb);
|
return skb_clone(skb);
|
||||||
#endif /* PLATFORM_FREEBSD */
|
#endif /* PLATFORM_FREEBSD */
|
||||||
}
|
}
|
||||||
static inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb)
|
inline struct sk_buff *_rtw_pskb_copy(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
#ifdef PLATFORM_LINUX
|
#ifdef PLATFORM_LINUX
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36))
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36))
|
||||||
|
|
@ -1268,12 +1268,8 @@ u32 _rtw_down_sema(_sema *sema)
|
||||||
inline void thread_exit(_completion *comp)
|
inline void thread_exit(_completion *comp)
|
||||||
{
|
{
|
||||||
#ifdef PLATFORM_LINUX
|
#ifdef PLATFORM_LINUX
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
|
|
||||||
kthread_complete_and_exit(comp, 0);
|
|
||||||
#else
|
|
||||||
complete_and_exit(comp, 0);
|
complete_and_exit(comp, 0);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PLATFORM_FREEBSD
|
#ifdef PLATFORM_FREEBSD
|
||||||
printf("%s", "RTKTHREAD_exit");
|
printf("%s", "RTKTHREAD_exit");
|
||||||
|
|
@ -2143,19 +2139,15 @@ static int isFileReadable(const char *path, u32 *sz)
|
||||||
{
|
{
|
||||||
struct file *fp;
|
struct file *fp;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
mm_segment_t oldfs;
|
mm_segment_t oldfs;
|
||||||
#endif
|
|
||||||
char buf;
|
char buf;
|
||||||
|
|
||||||
fp = filp_open(path, O_RDONLY, 0);
|
fp = filp_open(path, O_RDONLY, 0);
|
||||||
if (IS_ERR(fp))
|
if (IS_ERR(fp))
|
||||||
ret = PTR_ERR(fp);
|
ret = PTR_ERR(fp);
|
||||||
else {
|
else {
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
oldfs = get_fs();
|
oldfs = get_fs();
|
||||||
set_fs(KERNEL_DS);
|
set_fs(KERNEL_DS);
|
||||||
#endif
|
|
||||||
|
|
||||||
if (1 != readFile(fp, &buf, 1))
|
if (1 != readFile(fp, &buf, 1))
|
||||||
ret = PTR_ERR(fp);
|
ret = PTR_ERR(fp);
|
||||||
|
|
@ -2167,9 +2159,8 @@ static int isFileReadable(const char *path, u32 *sz)
|
||||||
*sz = i_size_read(fp->f_dentry->d_inode);
|
*sz = i_size_read(fp->f_dentry->d_inode);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
set_fs(oldfs);
|
set_fs(oldfs);
|
||||||
#endif
|
|
||||||
filp_close(fp, NULL);
|
filp_close(fp, NULL);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -2185,9 +2176,7 @@ static int isFileReadable(const char *path, u32 *sz)
|
||||||
static int retriveFromFile(const char *path, u8 *buf, u32 sz)
|
static int retriveFromFile(const char *path, u8 *buf, u32 sz)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
mm_segment_t oldfs;
|
mm_segment_t oldfs;
|
||||||
#endif
|
|
||||||
struct file *fp;
|
struct file *fp;
|
||||||
|
|
||||||
if (path && buf) {
|
if (path && buf) {
|
||||||
|
|
@ -2195,14 +2184,10 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
|
||||||
if (0 == ret) {
|
if (0 == ret) {
|
||||||
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
|
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
oldfs = get_fs();
|
oldfs = get_fs();
|
||||||
set_fs(KERNEL_DS);
|
set_fs(KERNEL_DS);
|
||||||
#endif
|
|
||||||
ret = readFile(fp, buf, sz);
|
ret = readFile(fp, buf, sz);
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
set_fs(oldfs);
|
set_fs(oldfs);
|
||||||
#endif
|
|
||||||
closeFile(fp);
|
closeFile(fp);
|
||||||
|
|
||||||
RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret);
|
RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret);
|
||||||
|
|
@ -2226,9 +2211,7 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
|
||||||
static int storeToFile(const char *path, u8 *buf, u32 sz)
|
static int storeToFile(const char *path, u8 *buf, u32 sz)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
mm_segment_t oldfs;
|
mm_segment_t oldfs;
|
||||||
#endif
|
|
||||||
struct file *fp;
|
struct file *fp;
|
||||||
|
|
||||||
if (path && buf) {
|
if (path && buf) {
|
||||||
|
|
@ -2236,14 +2219,10 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
|
||||||
if (0 == ret) {
|
if (0 == ret) {
|
||||||
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
|
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
|
||||||
|
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
oldfs = get_fs();
|
oldfs = get_fs();
|
||||||
set_fs(KERNEL_DS);
|
set_fs(KERNEL_DS);
|
||||||
#endif
|
|
||||||
ret = writeFile(fp, buf, sz);
|
ret = writeFile(fp, buf, sz);
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
|
|
||||||
set_fs(oldfs);
|
set_fs(oldfs);
|
||||||
#endif
|
|
||||||
closeFile(fp);
|
closeFile(fp);
|
||||||
|
|
||||||
RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);
|
RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);
|
||||||
|
|
@ -2345,12 +2324,6 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_p
|
||||||
if (!pnetdev)
|
if (!pnetdev)
|
||||||
goto RETURN;
|
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 = netdev_priv(pnetdev);
|
||||||
pnpi->priv = old_priv;
|
pnpi->priv = old_priv;
|
||||||
pnpi->sizeof_priv = sizeof_priv;
|
pnpi->sizeof_priv = sizeof_priv;
|
||||||
|
|
@ -2372,12 +2345,6 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv)
|
||||||
if (!pnetdev)
|
if (!pnetdev)
|
||||||
goto RETURN;
|
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 = netdev_priv(pnetdev);
|
||||||
|
|
||||||
pnpi->priv = rtw_zvmalloc(sizeof_priv);
|
pnpi->priv = rtw_zvmalloc(sizeof_priv);
|
||||||
|
|
@ -2451,7 +2418,7 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname)
|
||||||
|
|
||||||
rtw_init_netdev_name(pnetdev, 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)
|
if (rtnl_lock_needed)
|
||||||
ret = register_netdev(pnetdev);
|
ret = register_netdev(pnetdev);
|
||||||
|
|
@ -2574,9 +2541,7 @@ u64 rtw_division64(u64 x, u64 y)
|
||||||
inline u32 rtw_random32(void)
|
inline u32 rtw_random32(void)
|
||||||
{
|
{
|
||||||
#ifdef PLATFORM_LINUX
|
#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();
|
return prandom_u32();
|
||||||
#elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
|
#elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
|
||||||
u32 random_int;
|
u32 random_int;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue