1
0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-12-31 07:03:59 +00:00

Merge pull request #162 from kimocoder/v5.2.20

Merge changes
This commit is contained in:
Christian B 2018-08-06 11:42:42 +02:00 committed by GitHub
commit 125fa15d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 32 deletions

View File

@ -3,4 +3,3 @@ config RTL8812AU
depends on USB
---help---
Help message of RTL8812AU

View File

@ -196,6 +196,17 @@ ifeq ($(CONFIG_PCI_HCI), y)
HCI_NAME = pci
endif
ifeq ($(DEBUG), 1)
EXTRA_CFLAGS += -DDBG=1 -DCONFIG_RTW_DEBUG -DCONFIG_DBG_COUNTER -DRTW_LOG_LEVEL=5
EXTRA_CFLAGS += -DCONFIG_RADIOTAP_WITH_RXDESC
else ifeq ($(DEBUG), 2)
EXTRA_CFLAGS += -DDBG=1 -DCONFIG_RTW_DEBUG -DCONFIG_DBG_COUNTER -DRTW_LOG_LEVEL=5
EXTRA_CFLAGS += -DCONFIG_DEBUG_RTL871X
EXTRA_CFLAGS += -DCONFIG_RADIOTAP_WITH_RXDESC
else
EXTRA_CFLAGS += -DDBG=0
endif
ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\"
@ -214,18 +225,6 @@ EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\"
endif
#ifeq ($(RTL8814), 1)
#CONFIG_RTL8812A = n
#CONFIG_RTL8821A = n
#CONFIG_RTL8814A = y
#endif
#ifeq ($(RTL8821), 1)
#CONFIG_RTL8812A = y
#CONFIG_RTL8821A = y
#CONFIG_RTL8814A = n
#endif
ifeq ($(CONFIG_USB2_EXTERNAL_POWER), y)
EXTRA_CFLAGS += -DCONFIG_USE_EXTERNAL_POWER
endif

View File

@ -4,7 +4,7 @@
### DKMS
This driver can be installed using [DKMS]. This is a system which will automatically recompile and install a kernel module when a new kernel gets installed or updated. To make use of DKMS, install the `dkms` package, which on Debian (based) systems is done like this:
```
sudo apt install dkms
sudo apt-get install dkms
```
### Installation of Driver
@ -20,16 +20,11 @@ sudo ./dkms-remove.sh
```
### Make
For building & installing the rtl8812au/rtl8821au driver with 'make' use
For building & installing the driver with 'make' use
```
make
make install
```
and for building & installing the rtl8814au driver with 'make' use
```
make RTL8814=1
make install RTL8814=1
```
### Notes
Download
@ -46,7 +41,7 @@ sudo apt-get install linux-headers-`uname -r`
```
For Raspberry (RPI)
```
sudo apt install raspberrypi-kernel-headers
sudo apt-get install raspberrypi-kernel-headers
```
For setting monitor mode
1. Fix problematic interference in monitor mode.
@ -84,7 +79,7 @@ value can be y or n
#### statically by module parameter in /etc/modprobe.d/8812au.conf or wherever, for example:
```sh
options 8812au rtw_led_enable=0
options 88XXau rtw_led_enable=0
```
value can be 0 or 1

View File

@ -1,11 +1,10 @@
PACKAGE_NAME="realtek-rtl88xxau"
PACKAGE_VERSION="5.2.20.2~20180804"
CLEAN="make clean"
BUILT_MODULE_NAME[0]=8812au
PACKAGE_VERSION="5.2.20.2~20180805"
CLEAN="'make' clean"
BUILT_MODULE_NAME[0]=88XXau
PROCS_NUM=`nproc`
[ $PROCS_NUM -gt 16 ] && PROCS_NUM=16
DEST_MODULE_LOCATION[0]="/updates"
MAKE[0]="'make' -j$PROCS_NUM KVER=${kernelver} && 'make' -j$PROCS_NUM RTL8814=1 KVER=${kernelver}"
BUILT_MODULE_NAME[1]=8814au
DEST_MODULE_LOCATION[1]="/updates"
MAKE="'make' -j$PROCS_NUM KVER=${kernelver} KSRC=/lib/modules/${kernelver}/build"
AUTOINSTALL="yes"
REMAKE_INITRD=no

View File

@ -323,7 +323,7 @@
/*
* Debug Related Config
*/
#define DBG 1
// #define DBG 1
#define CONFIG_PROC_DEBUG

View File

@ -4816,8 +4816,8 @@ static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wd
int channel;
int control_freq;
int center_freq;
int center_freq2=0;
int width;
int center_freq2 = 0;
int width = NL80211_CHAN_WIDTH_20;
int band;
int bandWidth;
int offset;
@ -4829,7 +4829,7 @@ static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wd
return -ENODEV;
offset = rtw_get_oper_choffset(padapter);
channel = adapter_to_dvobj(padapter)->oper_channel;
center_freq = channel = adapter_to_dvobj(padapter)->oper_channel;
if (channel >= 1) {
switch (pHalData->current_band_type) {
case 0: