random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2026-01-26 04:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from domin144/fix_6.15

Browse Source 
Compilation fixes for kernels 6.13, 6.14 and 6.15
This commit is contained in:
Igor
2025-05-14 23:03:02 +02:00
committed by GitHub
parent 52e593e8c8 b01f1ad2eb
commit 66b7540c05
5 changed files with 302 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

569
Makefile
View File

File diff suppressed because it is too large Load Diff

2
README.md
View File

@@ -24,7 +24,7 @@ cd rtl8723ds
nano Makefile
```
Step - 2: Find the line that contains `EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE` and insert a `#` symbol at the beginning of that line.
Step - 2: Find the line that contains `ccflags-y += -DCONFIG_CONCURRENT_MODE` and insert a `#` symbol at the beginning of that line.
This comments that line and disables concurrent mode.
Step - 3: Now, run the following commands in the same Linux terminal.

4
include/osdep_service.h
View File

@@ -326,7 +326,11 @@ extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc);
__inline static unsigned char _cancel_timer_ex(_timer *ptimer)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0))
return timer_delete_sync(ptimer);
#else
return del_timer_sync(ptimer);
#endif
}
static __inline void thread_enter(char *name)

4
include/osdep_service_linux.h
View File

@@ -304,7 +304,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))
timer_delete_sync(ptimer);
#else
del_timer_sync(ptimer);
#endif
*bcancelled = 1;
}

8
os_dep/linux/ioctl_cfg80211.c
View File

@@ -3362,6 +3362,9 @@ static int cfg80211_rtw_set_txpower(struct wiphy *wiphy,
static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
struct wireless_dev *wdev,
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0))
unsigned int link_id,
#endif
int *dbm)
{
@@ -4520,7 +4523,10 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy
}
static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0))
, struct net_device *dev
, struct cfg80211_chan_def *chandef
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
, struct cfg80211_chan_def *chandef
#else
, struct ieee80211_channel *chan