2
0
mirror of https://github.com/cilynx/rtl88x2bu synced 2025-08-22 10:10:08 +00:00

Fix build for Linux v6.15

As usual, some code changes guarded by a preprocessor `if` were added.

Additionally, the Makefile had to be modified to replace all instances
of EXTRA_CFLAG with ccflags-y. Unlike usual, this change may affect the
building of the most recent version on an older kernel. However, initial
testing suggests that everything still works.

With both fixes the driver was able to run `apt full-upgrade` and to
push the result of the merge.
This commit is contained in:
Max Görner 2025-06-09 09:06:34 +02:00
commit 01e0f54ef6
6 changed files with 398 additions and 389 deletions

764
Makefile

File diff suppressed because it is too large Load Diff

View File

@ -28,6 +28,11 @@ Build confirmed on:
* Linux version `6.10.3` to `6.12.10` on Debian Trixie
* Linux version `6.13.0` (self-compiled) on Debian Trixie
As of lately the maintainer experienced issues with the driver on Debian
Testing, covering several Linux Kernel versions. More details can be found in
[issue 280](https://github.com/cilynx/rtl88x2bu/issues/280). Any suggestions on
how to troubleshoot or fix this are welcome there too.
## Using and Installing the Driver
### Simple Usage

View File

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -I$(src)/hal/phydm
ccflags-y += -I$(src)/hal/phydm
_PHYDM_FILES := hal/phydm/phydm_debug.o \
hal/phydm/phydm_antdiv.o\

View File

@ -1,4 +1,4 @@
EXTRA_CFLAGS += -I$(src)/hal/phydm
ccflags-y += -I$(src)/hal/phydm
_PHYDM_FILES := hal/phydm/phydm_debug.o \
hal/phydm/phydm_interface.o\

View File

@ -383,7 +383,11 @@ __inline static void _set_timer(_timer *ptimer, u32 delay_time)
__inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0))
*bcancelled = timer_delete_sync(&ptimer->timer) == 1 ? 1 : 0;
#else
*bcancelled = del_timer_sync(&ptimer->timer) == 1 ? 1 : 0;
#endif
}
static inline void _init_workitem(_workitem *pwork, void *pfunc, void *cntx)

View File

@ -1,8 +1,8 @@
EXTRA_CFLAGS += -DCONFIG_RTL8822B
ccflags-y += -DCONFIG_RTL8822B
ifeq ($(CONFIG_MP_INCLUDED), y)
### 8822B Default Enable VHT MP HW TX MODE ###
#EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
#ccflags-y += -DCONFIG_MP_VHT_HW_TX_MODE
#CONFIG_MP_VHT_HW_TX_MODE = y
endif