Compare commits
No commits in common. "kali/master" and "upstream/5.3.9_git20221105.dab6e02" have entirely different histories.
kali/maste
...
upstream/5
12
Makefile
12
Makefile
|
@ -9,10 +9,7 @@ EXTRA_CFLAGS += -Wno-unused-function
|
|||
EXTRA_CFLAGS += -Wno-unused
|
||||
EXTRA_CFLAGS += -Wno-address
|
||||
EXTRA_CFLAGS += -Wno-cast-function-type
|
||||
#EXTRA_CFLAGS += -Wno-discarded-qualifiers
|
||||
EXTRA_CFLAGS += -Wno-uninitialized
|
||||
EXTRA_CFLAGS += -Wno-sometimes-uninitialized
|
||||
EXTRA_CFLAGS += -Wno-enum-conversion
|
||||
EXTRA_CFLAGS += -Wno-discarded-qualifiers
|
||||
EXTRA_CFLAGS += -Wno-vla
|
||||
EXTRA_CFLAGS += -Wno-date-time
|
||||
|
||||
|
@ -22,7 +19,7 @@ ifeq ($(GCC_VER_49),1)
|
|||
EXTRA_CFLAGS += -Wno-date-time # Fix compile error && warning on gcc 4.9 and later
|
||||
endif
|
||||
|
||||
EXTRA_CFLAGS += -I$(src)/include -I$(srctree)/$(src)/include
|
||||
EXTRA_CFLAGS += -I$(src)/include
|
||||
|
||||
EXTRA_LDFLAGS += --strip-debug
|
||||
|
||||
|
@ -229,11 +226,10 @@ _HAL_INTFS_FILES := hal/hal_intf.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
|
||||
|
||||
EXTRA_CFLAGS += -I$(src)/hal/btc -I$(srctree)/$(src)/hal/btc
|
||||
EXTRA_CFLAGS += -I$(src)/hal/phydm -I$(srctree)/$(src)/hal/phydm
|
||||
EXTRA_CFLAGS += -I$(src)/hal/btc
|
||||
|
||||
########### HAL_RTL8188E #################################
|
||||
ifeq ($(CONFIG_RTL8188E), y)
|
||||
|
|
31
README.md
31
README.md
|
@ -18,37 +18,28 @@
|
|||
* MESH Support
|
||||
* Monitor mode
|
||||
* Frame injection
|
||||
* Up to kernel v6.5+
|
||||
* Up to kernel v6.0+
|
||||
... And a bunch of various wifi chipsets
|
||||
|
||||
# Howto build/install
|
||||
1. Compile and install the driver:
|
||||
```
|
||||
cd rtl8188eus
|
||||
make && sudo make install
|
||||
```
|
||||
2. Blacklist another drivers in order to use this one:
|
||||
```
|
||||
echo 'blacklist r8188eu' | sudo tee -a '/etc/modprobe.d/realtek.conf'
|
||||
echo 'blacklist rtl8xxxu' | sudo tee -a '/etc/modprobe.d/realtek.conf'
|
||||
```
|
||||
3. `reboot` or remove all drivers related to RTL8188 and reload this one:
|
||||
```
|
||||
rmmod r8188eu rtl8xxxu 8188eu
|
||||
modprobe 8188eu
|
||||
```
|
||||
1. You will need to blacklist another driver in order to use this one.
|
||||
2. `echo 'blacklist r8188eu'|sudo tee -a '/etc/modprobe.d/realtek.conf'`
|
||||
3. Reboot
|
||||
4. cd rtl8188eus
|
||||
5. `make && sudo make install`
|
||||
6. Reboot in order to blacklist and load the new driver/module.
|
||||
|
||||
# MONITOR MODE howto
|
||||
Use these steps to enter monitor mode.
|
||||
```
|
||||
sudo airmon-ng check kill
|
||||
sudo ip link set <interface> down
|
||||
sudo iw dev <interface> set type monitor
|
||||
$ sudo airmon-ng check kill
|
||||
$ sudo ip link set <interface> down
|
||||
$ sudo iw dev <interface> set type monitor
|
||||
```
|
||||
Frame injection test may be performed with
|
||||
(after kernel v5.2 scanning is slow, run a scan or simply an airodump-ng first!)
|
||||
```
|
||||
sudo aireplay-ng -9 <interface>
|
||||
$ aireplay -9 <interface>
|
||||
```
|
||||
|
||||
# NetworkManager configuration
|
||||
|
|
|
@ -117,13 +117,7 @@ static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_ta
|
|||
/* have a room for new tag */
|
||||
memmove(((unsigned char *)ph->tag + data_len), (unsigned char *)ph->tag, ntohs(ph->length));
|
||||
ph->length = htons(ntohs(ph->length) + data_len);
|
||||
#if (defined __GNUC__) && (__GNUC__ > 10)
|
||||
#pragma GCC diagnostic ignored "-Wstringop-overread"
|
||||
#endif
|
||||
memcpy((unsigned char *)ph->tag, tag, data_len);
|
||||
#if (defined __GNUC__) && (__GNUC__ > 10)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
return data_len;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,6 +14,9 @@
|
|||
*****************************************************************************/
|
||||
#define _RTW_MP_C_
|
||||
#include <drv_types.h>
|
||||
#ifdef PLATFORM_FREEBSD
|
||||
#include <sys/unistd.h> /* for RFHIGHPID */
|
||||
#endif
|
||||
|
||||
#include "../hal/phydm/phydm_precomp.h"
|
||||
#if defined(CONFIG_RTL8723B) || defined(CONFIG_RTL8821A)
|
||||
|
@ -160,6 +163,64 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv)
|
|||
|
||||
}
|
||||
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
#if 0
|
||||
void mp_wi_callback(
|
||||
IN NDIS_WORK_ITEM *pwk_item,
|
||||
IN PVOID cntx
|
||||
)
|
||||
{
|
||||
_adapter *padapter = (_adapter *)cntx;
|
||||
struct mp_priv *pmppriv = &padapter->mppriv;
|
||||
struct mp_wi_cntx *pmp_wi_cntx = &pmppriv->wi_cntx;
|
||||
|
||||
/* Execute specified action. */
|
||||
if (pmp_wi_cntx->curractfunc != NULL) {
|
||||
LARGE_INTEGER cur_time;
|
||||
ULONGLONG start_time, end_time;
|
||||
NdisGetCurrentSystemTime(&cur_time); /* driver version */
|
||||
start_time = cur_time.QuadPart / 10; /* The return value is in microsecond */
|
||||
|
||||
pmp_wi_cntx->curractfunc(padapter);
|
||||
|
||||
NdisGetCurrentSystemTime(&cur_time); /* driver version */
|
||||
end_time = cur_time.QuadPart / 10; /* The return value is in microsecond */
|
||||
|
||||
}
|
||||
|
||||
NdisAcquireSpinLock(&(pmp_wi_cntx->mp_wi_lock));
|
||||
pmp_wi_cntx->bmp_wi_progress = _FALSE;
|
||||
NdisReleaseSpinLock(&(pmp_wi_cntx->mp_wi_lock));
|
||||
|
||||
if (pmp_wi_cntx->bmpdrv_unload)
|
||||
NdisSetEvent(&(pmp_wi_cntx->mp_wi_evt));
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
static int init_mp_priv_by_os(struct mp_priv *pmp_priv)
|
||||
{
|
||||
struct mp_wi_cntx *pmp_wi_cntx;
|
||||
|
||||
if (pmp_priv == NULL)
|
||||
return _FAIL;
|
||||
|
||||
pmp_priv->rx_testcnt = 0;
|
||||
pmp_priv->rx_testcnt1 = 0;
|
||||
pmp_priv->rx_testcnt2 = 0;
|
||||
|
||||
pmp_priv->tx_testcnt = 0;
|
||||
pmp_priv->tx_testcnt1 = 0;
|
||||
|
||||
pmp_wi_cntx = &pmp_priv->wi_cntx
|
||||
pmp_wi_cntx->bmpdrv_unload = _FALSE;
|
||||
pmp_wi_cntx->bmp_wi_progress = _FALSE;
|
||||
pmp_wi_cntx->curractfunc = NULL;
|
||||
|
||||
return _SUCCESS;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef PLATFORM_LINUX
|
||||
static int init_mp_priv_by_os(struct mp_priv *pmp_priv)
|
||||
{
|
||||
|
@ -1879,6 +1940,17 @@ void SetPacketTx(PADAPTER padapter)
|
|||
pmp_priv->tx.PktTxThread = NULL;
|
||||
}
|
||||
#endif
|
||||
#ifdef PLATFORM_FREEBSD
|
||||
{
|
||||
struct proc *p;
|
||||
struct thread *td;
|
||||
pmp_priv->tx.PktTxThread = kproc_kthread_add(mp_xmit_packet_thread, pmp_priv,
|
||||
&p, &td, RFHIGHPID, 0, "MPXmitThread", "MPXmitThread");
|
||||
|
||||
if (pmp_priv->tx.PktTxThread < 0)
|
||||
RTW_INFO("Create PktTx Thread Fail !!!!!\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
Rtw_MPSetMacTxEDCA(padapter);
|
||||
exit:
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
realtek-rtl8188eus DKMS module for Debian
|
||||
|
||||
This package was automatically generated by the DKMS system,
|
||||
for distribution on Debian based operating systems.
|
|
@ -1,156 +0,0 @@
|
|||
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
|
||||
|
||||
* Initial release (see 5842)
|
||||
|
||||
-- Sophie Brun <sophie@offensive-security.com> Tue, 17 Dec 2019 17:14:38 +0100
|
|
@ -1,18 +0,0 @@
|
|||
Source: realtek-rtl8188eus-dkms
|
||||
Section: contrib/kernel
|
||||
Priority: optional
|
||||
Maintainer: Kali Developers <devel@kali.org>
|
||||
Uploaders: Sophie Brun <sophie@offensive-security.com>
|
||||
Build-Depends: debhelper-compat (= 13), dh-sequence-dkms
|
||||
Standards-Version: 4.6.2
|
||||
Homepage: https://github.com/aircrack-ng/rtl8188eus
|
||||
Vcs-Browser: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms
|
||||
Vcs-Git: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms.git
|
||||
|
||||
Package: realtek-rtl8188eus-dkms
|
||||
Architecture: all
|
||||
Depends: dkms (>= 1.95), ${misc:Depends}
|
||||
Description: Realtek RTL8188EUS driver in DKMS format
|
||||
This package provides the source code for RTL8188EUS Linux driver (with
|
||||
monitor mode and frame injection) to be build with dkms. Kernel sources or
|
||||
headers are required to compile this module.
|
|
@ -1,34 +0,0 @@
|
|||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: realtek-rtl8188eus-dkms
|
||||
Source: https://github.com/aircrack-ng/rtl8188eus
|
||||
Comment: dkms package built during installation
|
||||
|
||||
Files: *
|
||||
Copyright: 2007 - 2017 Realtek Corporation.
|
||||
License: GPL-2
|
||||
|
||||
Files: os_dep/linux/rhashtable.*
|
||||
Copyright: 2015 Herbert Xu <herbert@gondor.apana.org.au>
|
||||
2014-2015 Thomas Graf <tgraf@suug.ch>
|
||||
2008-2014 Patrick McHardy <kaber@trash.net>
|
||||
License: GPL-2
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2019 Sophie Brun <sophie@offensive-security.com>
|
||||
License: GPL-2
|
||||
|
||||
License: GPL-2
|
||||
This package is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License version 2 as published
|
||||
by the Free Software Foundation.
|
||||
.
|
||||
This package is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>
|
||||
.
|
||||
On Debian systems, the complete text of the GNU General
|
||||
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
|
@ -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 +0,0 @@
|
|||
README.md
|
|
@ -1,2 +0,0 @@
|
|||
core hal include Kconfig Makefile os_dep platform usr/src/realtek-rtl8188eus-${env:DEB_VERSION_UPSTREAM}
|
||||
debian/r8188eus-dkms.conf etc/modprobe.d
|
|
@ -1,21 +0,0 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
include /usr/share/dpkg/pkg-info.mk
|
||||
export DEB_VERSION_UPSTREAM
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
override_dh_dkms:
|
||||
# Force PACKAGE_VERSION to be DEB_VERSION_UPSTREAM
|
||||
sed -i dkms.conf -e 's%^PACKAGE_VERSION=.*%PACKAGE_VERSION="$(DEB_VERSION_UPSTREAM)"%'
|
||||
dh_dkms -- dkms.conf
|
||||
|
||||
execute_after_dh_fixperms:
|
||||
find debian/realtek-rtl8188eus-dkms/usr/src -type f -exec chmod -x {} \;
|
||||
|
||||
# Nothing to configure, build or auto-install (all is done after
|
||||
# installation using dkms)
|
||||
override_dh_auto_configure:
|
||||
override_dh_auto_build:
|
||||
override_dh_auto_install:
|
|
@ -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 +0,0 @@
|
|||
3.0 (quilt)
|
|
@ -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 +0,0 @@
|
|||
version=4
|
||||
opts="mode=git, pretty=5.3.9~git%cd.%h, pgpmode=none" \
|
||||
https://github.com/aircrack-ng/rtl8188eus.git \
|
||||
HEAD debian debian/script-targz
|
||||
|
||||
# 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
|
|
@ -407,7 +407,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
|
|||
return;
|
||||
}
|
||||
|
||||
if (pregpriv->wifi_spec == 1) { /* || (pmlmeinfo->HT_enable == 0)) */
|
||||
if ((pregpriv->wifi_spec == 1)) { /* || (pmlmeinfo->HT_enable == 0)) */
|
||||
precvpriv->is_any_non_be_pkts = _FALSE;
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -171,7 +171,7 @@ void hal_mpt_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14)
|
|||
} else if (IS_HARDWARE_TYPE_8723D(Adapter)) {
|
||||
/* 2.4G CCK TX DFIR */
|
||||
/* 2016.01.20 Suggest from RS BB mingzhi*/
|
||||
if (u1Channel == 14) {
|
||||
if ((u1Channel == 14)) {
|
||||
phy_set_bb_reg(Adapter, rCCK0_TxFilter2, bMaskDWord, 0x0000B81C);
|
||||
phy_set_bb_reg(Adapter, rCCK0_DebugPort, bMaskDWord, 0x00000000);
|
||||
phy_set_bb_reg(Adapter, 0xAAC, bMaskDWord, 0x00003667);
|
||||
|
|
|
@ -354,7 +354,7 @@ halrf_cmn_info_init(
|
|||
void
|
||||
halrf_cmn_info_hook(
|
||||
void *dm_void,
|
||||
enum halrf_cmninfo_hook cmn_info,
|
||||
u32 cmn_info,
|
||||
void *value
|
||||
);
|
||||
|
||||
|
|
|
@ -1535,7 +1535,7 @@ extern __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)
|
||||
extern __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));
|
||||
|
|
|
@ -417,9 +417,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
|
|||
if (ret != _SUCCESS)
|
||||
goto exit;
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
|
||||
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
|
||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
|
||||
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
|
||||
#else
|
||||
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
|
||||
|
@ -1106,7 +1104,6 @@ check_bss:
|
|||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL79))
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
|
||||
roam_info.links[0].channel = notify_channel;
|
||||
roam_info.links[0].bssid = cur_network->network.MacAddress;
|
||||
#else
|
||||
roam_info.bssid = cur_network->network.MacAddress;
|
||||
|
@ -1141,17 +1138,13 @@ check_bss:
|
|||
RTW_INFO("pwdev->sme_state(b)=%d\n", pwdev->sme_state);
|
||||
#endif
|
||||
|
||||
if (check_fwstate(pmlmepriv, WIFI_MONITOR_STATE) != _TRUE) {
|
||||
struct cfg80211_bss *bss;
|
||||
bss = cfg80211_get_bss(pwdev->wiphy, NULL, cur_network->network.MacAddress, NULL, 0,
|
||||
IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
|
||||
cfg80211_connect_bss(wdev_to_ndev(pwdev), cur_network->network.MacAddress, bss
|
||||
, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
|
||||
, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
|
||||
, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
|
||||
, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
|
||||
, WLAN_STATUS_SUCCESS, GFP_ATOMIC, NL80211_TIMEOUT_UNSPECIFIED);
|
||||
}
|
||||
if (check_fwstate(pmlmepriv, WIFI_MONITOR_STATE) != _TRUE)
|
||||
rtw_cfg80211_connect_result(pwdev, cur_network->network.MacAddress
|
||||
, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
|
||||
, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
|
||||
, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
|
||||
, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
|
||||
, WLAN_STATUS_SUCCESS, GFP_ATOMIC);
|
||||
#if defined(RHEL79) && (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE))
|
||||
RTW_INFO("pwdev->sme_state(a)=%d\n", pwdev->sme_state);
|
||||
#endif
|
||||
|
@ -1667,9 +1660,6 @@ exit:
|
|||
}
|
||||
|
||||
static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
, int link_id
|
||||
#endif
|
||||
, u8 key_index
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
, bool pairwise
|
||||
|
@ -1814,9 +1804,6 @@ addkey_end:
|
|||
}
|
||||
|
||||
static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
, int link_id
|
||||
#endif
|
||||
, u8 keyid
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
, bool pairwise
|
||||
|
@ -1982,9 +1969,6 @@ exit:
|
|||
}
|
||||
|
||||
static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
int link_id,
|
||||
#endif
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
u8 key_index, bool pairwise, const u8 *mac_addr)
|
||||
#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */
|
||||
|
@ -2005,11 +1989,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
|
|||
}
|
||||
|
||||
static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
|
||||
struct net_device *ndev,
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
int link_id,
|
||||
#endif
|
||||
u8 key_index
|
||||
struct net_device *ndev, u8 key_index
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
, bool unicast, bool multicast
|
||||
#endif
|
||||
|
@ -2057,11 +2037,7 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
|
|||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
|
||||
int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
|
||||
struct net_device *ndev,
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
int link_id,
|
||||
#endif
|
||||
u8 key_index)
|
||||
struct net_device *ndev, u8 key_index)
|
||||
{
|
||||
#define SET_DEF_KEY_PARAM_FMT " key_index=%d"
|
||||
#define SET_DEF_KEY_PARAM_ARG , key_index
|
||||
|
|
|
@ -363,7 +363,7 @@ void rtw_cfg80211_deinit_rfkill(struct wiphy *wiphy);
|
|||
#define rtw_cfg80211_connect_result(wdev, bssid, req_ie, req_ie_len, resp_ie, resp_ie_len, status, gfp) cfg80211_connect_result(wdev_to_ndev(wdev), bssid, req_ie, req_ie_len, resp_ie, resp_ie_len, status, gfp)
|
||||
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) && !defined(RHEL79))
|
||||
#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
|
||||
#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
|
||||
|
|
|
@ -9789,7 +9789,7 @@ static int rtw_mp_efuse_set(struct net_device *dev,
|
|||
rtw_hal_read_chip_info(padapter);
|
||||
/* set mac addr*/
|
||||
rtw_macaddr_cfg(adapter_mac_addr(padapter), get_hal_mac_addr(padapter));
|
||||
_rtw_memcpy((void *)padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */
|
||||
_rtw_memcpy(padapter->pnetdev->dev_addr, get_hal_mac_addr(padapter), ETH_ALEN); /* set mac addr to net_device */
|
||||
|
||||
#ifdef CONFIG_P2P
|
||||
rtw_init_wifidirect_addrs(padapter, adapter_mac_addr(padapter), adapter_mac_addr(padapter));
|
||||
|
|
|
@ -1618,11 +1618,7 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
|
|||
u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj);
|
||||
|
||||
#ifdef CONFIG_RTW_NAPI
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
netif_napi_add_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
|
||||
netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT);
|
||||
#endif /* CONFIG_RTW_NAPI */
|
||||
|
||||
#if defined(CONFIG_IOCTL_CFG80211)
|
||||
|
|
|
@ -145,7 +145,7 @@ struct sk_buff *rtw_cfg80211_vendor_event_alloc(
|
|||
struct sk_buff *skb;
|
||||
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0))
|
||||
skb = cfg80211_vendor_event_alloc(wiphy, NULL, len, event_id, gfp);
|
||||
skb = cfg80211_vendor_event_alloc(wiphy, len, event_id, gfp);
|
||||
#else
|
||||
skb = cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp);
|
||||
#endif
|
||||
|
|
|
@ -2451,7 +2451,7 @@ int rtw_change_ifname(_adapter *padapter, const char *ifname)
|
|||
|
||||
rtw_init_netdev_name(pnetdev, ifname);
|
||||
|
||||
_rtw_memcpy((void *)pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
|
||||
_rtw_memcpy(pnetdev->dev_addr, adapter_mac_addr(padapter), ETH_ALEN);
|
||||
|
||||
if (rtnl_lock_needed)
|
||||
ret = register_netdev(pnetdev);
|
||||
|
@ -2574,9 +2574,7 @@ u64 rtw_division64(u64 x, u64 y)
|
|||
inline u32 rtw_random32(void)
|
||||
{
|
||||
#ifdef PLATFORM_LINUX
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
return get_random_u32();
|
||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||
return prandom_u32();
|
||||
#elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18))
|
||||
u32 random_int;
|
||||
|
|
Loading…
Reference in New Issue