diff --git a/README.md b/README.md index 4c56f07..6e5f5ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # REALTEK RTL88x2B USB Linux Driver **Current Driver Version**: 5.13.1-30 -**Support Kernel**: 2.6.24 ~ 6.10 (with unofficial patches) +**Support Kernel**: 2.6.24 ~ 6.14 (with unofficial patches) Linux in-tree rtw8822bu driver is working in process, check [this](https://lore.kernel.org/lkml/20220518082318.3898514-1-s.hauer@pengutronix.de/) patchset. diff --git a/dkms.conf b/dkms.conf index 92cab19..e9bf520 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,7 +1,6 @@ PACKAGE_NAME="rtl88x2bu" PACKAGE_VERSION="@PKGVER@" MAKE="'make' -j$(nproc) KVER=${kernelver} KSRC=/lib/modules/${kernelver}/build" -CLEAN="make clean" BUILT_MODULE_NAME[0]="88x2bu" DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless" AUTOINSTALL="yes" diff --git a/hal/phydm/phydm_dfs.c b/hal/phydm/phydm_dfs.c index a32a498..36fca6f 100644 --- a/hal/phydm/phydm_dfs.c +++ b/hal/phydm/phydm_dfs.c @@ -1280,13 +1280,14 @@ void phydm_dfs_histogram_radar_distinguish( dfs->pri_hold_sum[i] = dfs->pri_hold_sum[i] + dfs->pri_hold[(dfs->hist_idx + 1) % 3][i] + dfs->pri_hold[(dfs->hist_idx + 2) % 3][i]; - } - /*@For long radar type*/ - for (j = 1; j < 4; j++) { - dfs->pw_long_hold_sum[i] = dfs->pw_long_hold_sum[i] + - dfs->pw_hold[(dfs->hist_long_idx + j) % 4][i]; - dfs->pri_long_hold_sum[i] = dfs->pri_long_hold_sum[i] + - dfs->pri_hold[(dfs->hist_long_idx + j) % 4][i]; + + /*@For long radar type*/ + for (j = 1; j < 4; j++) { + dfs->pw_long_hold_sum[i] = dfs->pw_long_hold_sum[i] + + dfs->pw_hold[(dfs->hist_long_idx + j) % 4][i]; + dfs->pri_long_hold_sum[i] = dfs->pri_long_hold_sum[i] + + dfs->pri_hold[(dfs->hist_long_idx + j) % 4][i]; + } } dfs->hist_idx++; diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 1b042f6..7869237 100755 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -4658,6 +4658,9 @@ exit: 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) { diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index a490028..e12dbfc 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -32,7 +32,9 @@ atomic_t _malloc_size = ATOMIC_INIT(0); #endif #endif /* DBG_MEMORY_LEAK */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0) +MODULE_IMPORT_NS("VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver"); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver); #endif